clippy fixes

Author: jgarzik

file/file.rs

@@ -110,7 +110,7 @@ fn get_magic_files(args: &Args) -> Vec<PathBuf> {
     magic_files
 }
 
-fn analyze_file(mut path: String, args: &Args, magic_files: &Vec<PathBuf>) {
+fn analyze_file(mut path: String, args: &Args, magic_files: &[PathBuf]) {
     if path == "-" {
         path = String::new();
         io::stdin().read_line(&mut path).unwrap();

mailx/mailbox.rs

@@ -232,7 +232,7 @@ impl Mailbox {
                 let address_field = if show_to && msg.from().contains(&user) {
                     format!("To {}", truncate(msg.to(), 18))
                 } else {
-                    msg.from_short()
+                    msg.short_from()
                 };
 
                 let date = msg.short_date();

mailx/message.rs

@@ -186,7 +186,7 @@ impl Message {
     }
 
     /// Extract the sender's name or address for header display
-    pub fn from_short(&self) -> String {
+    pub fn short_from(&self) -> String {
         let from = self.from();
         // Try to extract name from "Name <email>" format
         if let Some(start) = from.find('<') {

mailx/msglist.rs

@@ -163,22 +163,22 @@ fn parse_single_spec(
         }
         _ => {
             // Could be a number, /string, :c, or address
-            if spec.starts_with('/') {
+            if let Some(suffix) = spec.strip_prefix('/') {
                 // Search subject
-                let search = &spec[1..].to_lowercase();
+                let search = suffix.to_lowercase();
                 let matches: Vec<usize> = mb
                     .messages
                     .iter()
                     .enumerate()
                     .filter(|(_, m)| {
                         (for_undelete || m.state != MessageState::Deleted)
-                            && m.subject().to_lowercase().contains(search)
+                            && m.subject().to_lowercase().contains(&search)
                     })
                     .map(|(i, _)| i + 1)
                     .collect();
 
                 if matches.is_empty() {
-                    Err(format!("No messages matching /{}", &spec[1..]))
+                    Err(format!("No messages matching /{}", suffix))
                 } else {
                     Ok(matches)
                 }

pax/subst.rs

@@ -124,13 +124,7 @@ impl Substitution {
         let mut pos = 0;
         let mut any_match = false;
 
-        loop {
-            // Try to match at or after current position
-            let matches = match self.regex.captures_at(&result, pos) {
-                Some(m) => m,
-                None => break,
-            };
-
+        while let Some(matches) = self.regex.captures_at(&result, pos) {
             any_match = true;
 
             // Build the replacement string

sh/builtin/mod.rs

@@ -71,6 +71,7 @@ mod unalias;
 mod unset;
 mod wait;
 
+#[allow(clippy::enum_variant_names)]
 pub enum BuiltinError {
     CustomError(String),
     AssignmentError(CannotModifyReadonly),

sh/builtin/ulimit.rs

@@ -144,38 +144,34 @@ impl UlimitArgs {
             return Err("ulimit: cannot set limit for all resources".to_string());
         }
 
-        if limit.is_none() && resource_limit.is_some() {
-            if newlimit.is_some() {
-                return Ok(UlimitArgs {
-                    limit: LimitType::Both,
-                    resource: resource_limit.unwrap(),
-                    newlimit,
-                });
+        match (limit, resource_limit) {
+            (None, Some(resource)) => {
+                if newlimit.is_some() {
+                    Ok(UlimitArgs {
+                        limit: LimitType::Both,
+                        resource,
+                        newlimit,
+                    })
+                } else {
+                    Ok(UlimitArgs {
+                        limit: LimitType::Soft,
+                        resource,
+                        newlimit: None,
+                    })
+                }
             }
-            return Ok(UlimitArgs {
-                limit: LimitType::Soft,
-                resource: resource_limit.unwrap(),
-                newlimit: None,
-            });
-        }
-
-        if limit.is_some() && resource_limit.is_none() {
-            return Ok(UlimitArgs {
-                limit: limit.unwrap(),
+            (Some(lim), None) => Ok(UlimitArgs {
+                limit: lim,
                 resource: ResourceLimit::FSize,
                 newlimit,
-            });
-        }
-
-        if limit.is_some() && resource_limit.is_some() {
-            return Ok(UlimitArgs {
-                limit: limit.unwrap(),
-                resource: resource_limit.unwrap(),
+            }),
+            (Some(lim), Some(resource)) => Ok(UlimitArgs {
+                limit: lim,
+                resource,
                 newlimit,
-            });
+            }),
+            (None, None) => Err("ulimit: invalid arguments".to_string()),
         }
-
-        Err("ulimit: invalid arguments".to_string())
     }
 }
 

sh/cli/terminal.rs

@@ -43,7 +43,7 @@ impl Terminal {
     /// # Panic
     /// Panics if the current process is not attached to a terminal.
     pub fn set_nonblocking_no_echo(&self) {
-        let mut termios = self.base_settings.clone().unwrap();
+        let mut termios = self.base_settings.unwrap();
         termios.c_lflag &= !(libc::ECHO | libc::ICANON);
         termios.c_cc[libc::VMIN] = 0;
         termios.c_cc[libc::VTIME] = 0;
@@ -53,7 +53,7 @@ impl Terminal {
     /// # Panic
     /// Panics if the current process is not attached to a terminal.
     pub fn set_nonblocking(&self) {
-        let mut termios = self.base_settings.clone().unwrap();
+        let mut termios = self.base_settings.unwrap();
         termios.c_lflag &= !libc::ICANON;
         termios.c_cc[libc::VMIN] = 0;
         termios.c_cc[libc::VTIME] = 0;

sh/os/mod.rs

@@ -86,6 +86,7 @@ pub enum ForkResult {
     Parent { child: Pid },
 }
 
+#[allow(clippy::comparison_chain)]
 pub fn fork() -> OsResult<ForkResult> {
     // fork in general is not safe for multithreaded programs, but all code in this module is single
     // threaded, so this is safe

sh/os/signals.rs

@@ -118,9 +118,9 @@ impl FromStr for Signal {
     }
 }
 
-impl Into<i32> for Signal {
-    fn into(self) -> i32 {
-        match self {
+impl From<Signal> for i32 {
+    fn from(value: Signal) -> i32 {
+        match value {
             Signal::SigHup => libc::SIGHUP,
             Signal::SigInt => libc::SIGINT,
             Signal::SigQuit => libc::SIGQUIT,