clippy fixes

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

src/cd321x.rs

@@ -79,7 +79,7 @@ fn verify_i2c_device(bus: &str, slave_address: u16) -> Result<LinuxI2CDevice> {
     let forced = unsafe { LinuxI2CDevice::force_new(bus, slave_address) };
     match forced {
         Ok(dev) => Ok(dev),
-        Err(_) => Err(Error::I2CError),
+        Err(_) => Err(Error::I2C),
     }
 }
 
@@ -152,16 +152,14 @@ impl Device {
         buf.push(reg);
         buf.push(size);
         buf.extend_from_slice(data);
-        self.i2c.write(&buf).map_err(|_| Error::I2CError)?;
+        self.i2c.write(&buf).map_err(|_| Error::I2C)?;
         Ok(())
     }
 
     fn read_block(&mut self, reg: u8, buf: &mut [u8]) -> Result<()> {
-        self.i2c.write(&[reg]).map_err(|_| Error::I2CError)?;
+        self.i2c.write(&[reg]).map_err(|_| Error::I2C)?;
         let mut internal_buf = vec![0u8; buf.len() + 1];
-        self.i2c
-            .read(&mut internal_buf)
-            .map_err(|_| Error::I2CError)?;
+        self.i2c.read(&mut internal_buf).map_err(|_| Error::I2C)?;
         buf.copy_from_slice(&internal_buf[1..=buf.len()]);
 
         Ok(())
@@ -176,7 +174,7 @@ impl Device {
     }
 
     fn lock(&mut self, key: &[u8]) -> Result<()> {
-        self.exec_cmd(b"LOCK", &key)
+        self.exec_cmd(b"LOCK", key)
     }
 
     fn dbma(&mut self, debug: bool) -> Result<()> {

src/main.rs

@@ -20,9 +20,10 @@ enum Error {
     InvalidArgument,
     ReconnectTimeout,
     ControllerTimeout,
-    I2CError,
+    I2C,
     Io(std::io::Error),
     Utf8(std::str::Utf8Error),
+    Parse(std::num::ParseIntError),
 }
 
 type Result<T> = std::result::Result<T, Error>;
@@ -64,10 +65,10 @@ fn vdmtool() -> Result<()> {
 
     let addr_str = matches.get_one::<String>("address").unwrap();
     let addr: u16;
-    if addr_str.starts_with("0x") {
-        addr = u16::from_str_radix(&addr_str[2..], 16).unwrap();
+    if let Some(stripped) = addr_str.strip_prefix("0x") {
+        addr = u16::from_str_radix(stripped, 16).map_err(Error::Parse)?;
     } else {
-        addr = u16::from_str_radix(addr_str, 10).unwrap();
+        addr = addr_str.parse::<u16>().map_err(Error::Parse)?;
     }
 
     let code = device.to_uppercase();