fix clippy warnings

Author: cartercanedy

examples/adstool.rs

@@ -754,12 +754,12 @@ fn print_read_value(typ: VarType, buf: &[u8], hex: bool) {
         }
         VarType::Real => {
             let v = f32::from_le_bytes(buf[..4].try_into().expect("size"));
-            println!("{}", v);
+            println!("{v}");
             return;
         }
         VarType::Lreal => {
             let v = f64::from_le_bytes(buf[..8].try_into().expect("size"));
-            println!("{}", v);
+            println!("{v}");
             return;
         }
         VarType::Byte => buf[0] as i128,
@@ -773,9 +773,9 @@ fn print_read_value(typ: VarType, buf: &[u8], hex: bool) {
     };
     // Only reaches here for integer types
     if hex {
-        println!("{:#x}", value);
+        println!("{value:#x}");
     } else {
-        println!("{}", value);
+        println!("{value}");
     }
 }
 

src/client.rs

@@ -149,12 +149,13 @@ impl Drop for Client {
             .get_mut()
             .expect("notification handle cache lock was poisoned");
 
-        // Remove our port from the router, if necessary.
-        if self.source_port_opened {
-            let mut close_port_msg = [1, 0, 2, 0, 0, 0, 0, 0];
-            LE::write_u16(&mut close_port_msg[6..], self.source.port());
-
-            let _ = self.socket.write().map(|mut socket| socket.write_all(&close_port_msg));
+        if let Ok(ref mut socket) = self.socket.write() {
+            // Remove our port from the router, if necessary.
+            if self.source_port_opened {
+                let mut close_port_msg = [1, 0, 2, 0, 0, 0, 0, 0];
+                LE::write_u16(&mut close_port_msg[6..], self.source.port());
+                let _ = socket.write_all(&close_port_msg);
+            }
         }
 
         self.worker.stop();
@@ -482,14 +483,14 @@ impl ClientWorker {
 
             let _ = socket.shutdown(Shutdown::Both);
 
-            let _ = pending.write().map(|mut pending| {
+            if let Ok(ref mut pending) = pending.write() {
                 let keys = pending.keys().cloned().collect_vec();
                 for key in keys {
                     if let Some(channel) = pending.remove(&key) {
                         let _ = channel.send(None);
                     };
                 }
-            });
+            }
 
             result
         });

src/notif.rs

@@ -61,7 +61,7 @@ impl std::fmt::Debug for Notification {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         writeln!(f, "Notification [")?;
         for sample in self.samples() {
-            writeln!(f, "    {:?}", sample)?;
+            writeln!(f, "    {sample:?}")?;
         }
         write!(f, "]")
     }