Skip to content

Commit 3b200f6

Browse files
author
Noah Pederson
committed
More safe handling of usize -> isize conversion with sane failure mode
1 parent 6ebeffa commit 3b200f6

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/mock.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// option. This file may not be copied, modified, or distributed
77
// except according to those terms.
88
use core::{I2CDevice, I2CMessage, I2CTransfer};
9+
use std::convert::TryFrom;
910
use std::io;
1011

1112
/// I2C mock result type
@@ -44,7 +45,12 @@ impl I2CRegisterMap {
4445
fn read(&mut self, data: &mut [u8]) -> I2CResult<()> {
4546
let len = data.len();
4647
data.clone_from_slice(&self.registers[self.offset..(self.offset + len)]);
47-
println!("READ | 0x{:X} : {:?}", self.offset as isize - data.len() as isize, data);
48+
println!(
49+
"READ | 0x{:X} : {:?}",
50+
isize::try_from(self.offset).unwrap_or(0xBAD)
51+
- isize::try_from(data.len()).unwrap_or(0xBAD),
52+
data
53+
);
4854
Ok(())
4955
}
5056

0 commit comments

Comments
 (0)