Merge pull request #285 from fox0/clippy--nonminimal_bool

Fix clippy::type_complexity, suspicious_open_options, nonminimal_bool

Author: jgarzik

file/find.rs

@@ -388,7 +388,7 @@ fn evaluate_expression(
                 Expr::Newer(f) => {
                     if let Ok(metadata) = fs::metadata(f) {
                         if let Ok(file_metadata) = file.metadata() {
-                            if !(file_metadata.modified().unwrap() > metadata.modified().unwrap()) {
+                            if file_metadata.modified().unwrap() <= metadata.modified().unwrap() {
                                 c_files.remove(file.path());
                             }
                         }

m4/test-manager/src/main.rs

@@ -155,6 +155,7 @@ fn update_snapshots(args: &Args, update: &UpdateSnapshots) {
             }
             let mut f = std::fs::OpenOptions::new()
                 .write(true)
+                .truncate(true)
                 .create(true)
                 .open(snapshot_file)
                 .unwrap();

tree/common/mod.rs

@@ -19,6 +19,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+pub type InodeMap = HashMap<(u64, u64), (ftw::FileDescriptor, CString)>;
+
 /// Return the error message.
 ///
 /// This is for compatibility with coreutils mv. `format!("{e}")` will append
@@ -441,7 +443,7 @@ pub fn copy_file<F>(
     source_arg: &Path,
     target_arg: &Path,
     created_files: &mut HashSet<PathBuf>,
-    mut inode_map: Option<&mut HashMap<(u64, u64), (ftw::FileDescriptor, CString)>>,
+    mut inode_map: Option<&mut InodeMap>,
     prompt_fn: F,
 ) -> io::Result<()>
 where
@@ -646,7 +648,7 @@ pub fn copy_files<F>(
     cfg: &CopyConfig,
     sources: &[PathBuf],
     target: &Path,
-    mut inode_map: Option<&mut HashMap<(u64, u64), (ftw::FileDescriptor, CString)>>,
+    mut inode_map: Option<&mut InodeMap>,
     prompt_fn: F,
 ) -> Option<()>
 where

users/talk.rs

@@ -45,10 +45,16 @@ struct Args {
     ttyname: Option<String>,
 }
 
+pub struct State {
+    pub msg_bytes1: Vec<u8>,
+    pub msg_bytes2: Vec<u8>,
+    pub socket: Arc<UdpSocket>,
+    pub talkd_addr: SocketAddr,
+}
+
 /// A static variable to hold the state of delete invitations on SIGINT signal.
-static DELETE_INVITATIONS: LazyLock<
-    Arc<Mutex<Option<(Vec<u8>, Vec<u8>, Arc<UdpSocket>, SocketAddr)>>>,
-> = LazyLock::new(|| Arc::new(Mutex::new(None)));
+static DELETE_INVITATIONS: LazyLock<Arc<Mutex<Option<State>>>> =
+    LazyLock::new(|| Arc::new(Mutex::new(None)));
 
 /// The size of the buffer for control message fields like l_name, r_name, and r_tty in CtlMsg.
 const BUFFER_SIZE: usize = 12;
@@ -954,7 +960,13 @@ fn handle_new_invitation(
 
     let clone_socket = Arc::clone(&socket);
 
-    *DELETE_INVITATIONS.lock().unwrap() = Some((msg_bytes1, msg_bytes2, clone_socket, talkd_addr));
+    *DELETE_INVITATIONS.lock().unwrap() = Some(State {
+        msg_bytes1,
+        msg_bytes2,
+        socket: clone_socket,
+        talkd_addr,
+    });
+
     // Start listening for incoming TCP connections.
     for stream in listener.incoming() {
         match stream {
@@ -1620,12 +1632,10 @@ pub fn handle_signals(signal_code: libc::c_int) {
     eprintln!("Connection closed, exiting...");
 
     // Lock the DELETE_INVITATIONS mutex and check for an existing invitation
-    if let Some((msg_bytes1, msg_bytes2, socket, talkd_addr)) =
-        DELETE_INVITATIONS.lock().unwrap().as_ref()
-    {
+    if let Some(state) = DELETE_INVITATIONS.lock().unwrap().as_ref() {
         // Handle the deletion of invitations
-        handle_delete_invitations(socket, msg_bytes1, talkd_addr);
-        handle_delete_invitations(socket, msg_bytes2, talkd_addr);
+        handle_delete_invitations(&state.socket, &state.msg_bytes1, &state.talkd_addr);
+        handle_delete_invitations(&state.socket, &state.msg_bytes2, &state.talkd_addr);
     }
 
     // Exit the process with a code indicating the signal received