Simplified Rust code using ?-operator on Option (Rust 1.22).

This commit is contained in:
Project Nayuki 2019-08-08 06:58:20 +00:00
parent 20e904578e
commit 50d00ebf76
1 changed files with 1 additions and 4 deletions

View File

@ -1128,10 +1128,7 @@ impl QrSegment {
if seg.numchars >= 1 << ccbits {
return None; // The segment's length doesn't fit the field's bit width
}
match result.checked_add(4 + (ccbits as usize) + seg.data.len()) {
None => return None, // The sum will overflow a usize type
Some(val) => result = val,
}
result = result.checked_add(4 + (ccbits as usize) + seg.data.len())?;
}
Some(result)
}