Fix clippy warnings

Nicoretti · Apr 19, 2024 · b2b7e02 · b2b7e02
1 parent 887bc4a
commit b2b7e02
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -1,7 +1,6 @@
 #![deny(warnings)]
 use anyhow::Context;
 use clap::Parser;
-use env_logger;
 use std::convert::TryInto;
 use std::io::BufRead;
 use std::process::exit;

diff --git a/src/lib.rs b/src/lib.rs
@@ -310,7 +310,7 @@ impl Ka3005p {
         let printable_ascii = |bytes: Vec<u8>| -> String {
             bytes
                 .into_iter()
-                .filter(|&b| b >= 32 && b <= 126)
+                .filter(|&b| (32..=126).contains(&b))
                 .collect::<Vec<u8>>()
                 .into_iter()
                 .map(|b| b as char)

diff --git a/src/py_module.rs b/src/py_module.rs
@@ -53,18 +53,15 @@ impl PowerSupply {
         Ok(self
             .inner
             .execute(command)
-            .map_err(|e| Into::<Ka3005pError>::into(e))?)
+            .map_err(Into::<Ka3005pError>::into)?)
     }
 
     /// Get the status of the power supply.
     ///
     /// Returns:
     ///     Status of the power supply.
     fn _status(&mut self) -> PyResult<Status> {
-        Ok(self
-            .inner
-            .status()
-            .map_err(|e| Into::<Ka3005pError>::into(e))?)
+        Ok(self.inner.status().map_err(Into::<Ka3005pError>::into)?)
     }
 }
 
@@ -81,10 +78,10 @@ impl PowerSupply {
     fn new(serial_port: Option<&str>) -> PyResult<Self> {
         let supply = match serial_port {
             Some(port) => PowerSupply {
-                inner: Ka3005p::new(port).map_err(|e| Into::<Ka3005pError>::into(e))?,
+                inner: Ka3005p::new(port).map_err(Into::<Ka3005pError>::into)?,
             },
             None => PowerSupply {
-                inner: find_serial_port().map_err(|e| Into::<Ka3005pError>::into(e))?,
+                inner: find_serial_port().map_err(Into::<Ka3005pError>::into)?,
             },
         };
         Ok(supply)
@@ -113,7 +110,7 @@ impl PowerSupply {
         Ok(self
             .inner
             .run_command(command)
-            .map_err(|e| Into::<Ka3005pError>::into(e))?)
+            .map_err(Into::<Ka3005pError>::into)?)
     }
 
     /// Get the output current setting of the power supply.