status-im
/
QR-Code-generator
mirror of https://github.com/status-im/QR-Code-generator.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweaked Rust code to convert more integer casts from 'as' to 'from'.

This commit is contained in:
Project Nayuki 2019-09-18 20:40:23 +00:00
parent 6e088f72d3
commit fe992753d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust/src/lib.rs
View File

@ -1001,7 +1001,7 @@ impl QrSegment {
let mut accumcount: u8 = 0; let mut accumcount: u8 = 0;
for &c in text { for &c in text {
assert!('0' <= c && c <= '9', "String contains non-numeric characters"); assert!('0' <= c && c <= '9', "String contains non-numeric characters");
accumdata = accumdata * 10 + ((c as u32) - ('0' as u32)); accumdata = accumdata * 10 + (u32::from(c) - u32::from('0'));
accumcount += 1; accumcount += 1;
if accumcount == 3 { if accumcount == 3 {
bb.append_bits(accumdata, 10); bb.append_bits(accumdata, 10);
@ -1124,7 +1124,7 @@ impl QrSegment {
if seg.numchars >= 1 << ccbits { if seg.numchars >= 1 << ccbits {
return None; // The segment's length doesn't fit the field's bit width return None; // The segment's length doesn't fit the field's bit width
} }
result = result.checked_add(4 + (ccbits as usize) + seg.data.len())?; result = result.checked_add(4 + usize::from(ccbits) + seg.data.len())?;
} }
Some(result) Some(result)
} }
@ -1194,7 +1194,7 @@ impl QrSegmentMode {
Byte => [ 8, 16, 16], Byte => [ 8, 16, 16],
Kanji => [ 8, 10, 12], Kanji => [ 8, 10, 12],
Eci => [ 0, 0, 0], Eci => [ 0, 0, 0],
})[((ver.value() + 7) / 17) as usize] })[usize::from((ver.value() + 7) / 17)]
} }
} }