Simplified some Rust code.

pull/39/merge
Project Nayuki 6 years ago
parent 0723ac0d17
commit 4e774437b3

@ -102,10 +102,7 @@ fn read_int() -> i16 {
let mut chrs: Vec<char> = line.chars().collect(); let mut chrs: Vec<char> = line.chars().collect();
assert_eq!(chrs.pop().unwrap(), '\n'); assert_eq!(chrs.pop().unwrap(), '\n');
let line: String = chrs.iter().cloned().collect(); let line: String = chrs.iter().cloned().collect();
match line.parse::<i16>() { line.parse::<i16>().expect("Invalid number")
Ok(x) => x,
Err(_) => panic!("Invalid number"),
}
} }

@ -927,10 +927,8 @@ impl QrSegment {
let mut accumdata: u32 = 0; let mut accumdata: u32 = 0;
let mut accumcount: u32 = 0; let mut accumcount: u32 = 0;
for c in text { for c in text {
let i = match ALPHANUMERIC_CHARSET.iter().position(|x| *x == *c) { let i = ALPHANUMERIC_CHARSET.iter().position(|x| *x == *c)
None => panic!("String contains unencodable characters in alphanumeric mode"), .expect("String contains unencodable characters in alphanumeric mode");
Some(j) => j,
};
accumdata = accumdata * 45 + (i as u32); accumdata = accumdata * 45 + (i as u32);
accumcount += 1; accumcount += 1;
if accumcount == 2 { if accumcount == 2 {

Loading…
Cancel
Save