clippy auto-fixes

Author: jgarzik

calc/expr.rs

@@ -227,14 +227,12 @@ fn logop(lhs: &Token, rhs: &Token, is_and: bool) -> Token {
         } else {
             Token::Integer(0)
         }
+    } else if !lhs_zero {
+        lhs.clone()
+    } else if !rhs_zero {
+        rhs.clone()
     } else {
-        if !lhs_zero {
-            lhs.clone()
-        } else if !rhs_zero {
-            rhs.clone()
-        } else {
-            Token::Integer(0)
-        }
+        Token::Integer(0)
     }
 }
 

datetime/cal.rs

@@ -102,7 +102,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // If no arguments are provided, display the current month
     if args.month.is_none() && args.year.is_none() {
         let now = chrono::Local::now();
-        args.month = Some(now.month() as u32);
+        args.month = Some(now.month());
         args.year = Some(now.year() as u32);
 
     // If only one argument is provided, assume it is the entire year

editors/vi/editor.rs

@@ -2567,7 +2567,7 @@ impl Editor {
         if let Some('=') = ztype {
             // For '=', print separator line around current line
             let cols = self.terminal.size().cols as usize;
-            let separator: String = std::iter::repeat('-').take(40.min(cols / 2)).collect();
+            let separator: String = "-".repeat(40.min(cols / 2));
             let half = count / 2;
             let before_start = target_line.saturating_sub(half).max(1);
 

fs/df.rs

@@ -238,7 +238,7 @@ impl Mount {
         let percentage_used = percentage_used.ceil() as u32;
 
         FieldsData {
-            fields: fields,
+            fields,
             source: &self.devname,
             size: total,
             used,

ftw/src/dir.rs

@@ -16,7 +16,7 @@ pub struct EntryInternal<'a> {
     phantom: PhantomData<&'a libc::dirent>,
 }
 
-impl<'a> EntryInternal<'a> {
+impl EntryInternal<'_> {
     pub fn name_cstr(&self) -> &CStr {
         // Avoid dereferencing `dirent` when getting its fields. See note at:
         // https://github.com/rust-lang/rust/blob/1.80.1/library/std/src/sys/pal/unix/fs.rs#L725-L742
@@ -193,7 +193,7 @@ pub struct DeferredDirIterator<'a> {
     visited: RefMut<'a, HashSet<libc::ino_t>>,
 }
 
-impl<'a> Drop for DeferredDirIterator<'a> {
+impl Drop for DeferredDirIterator<'_> {
     fn drop(&mut self) {
         unsafe {
             libc::closedir(self.dirp);

mailx/mailbox.rs

@@ -230,7 +230,7 @@ impl Mailbox {
 
                 // Decide whether to show To or From
                 let address_field = if show_to && msg.from().contains(&user) {
-                    format!("To {}", truncate(&msg.to().to_string(), 18))
+                    format!("To {}", truncate(msg.to(), 18))
                 } else {
                     msg.from_short()
                 };

mailx/main.rs

@@ -98,7 +98,7 @@ fn run_receive_mode(args: &Args) -> i32 {
     }
 
     let mailbox_path = if args.read_mbox {
-        args.file.clone().unwrap_or_else(|| get_mbox_path())
+        args.file.clone().unwrap_or_else(get_mbox_path)
     } else {
         args.file.clone().unwrap_or_else(get_system_mailbox)
     };

process/kill.rs

@@ -72,7 +72,7 @@ fn send_signal(prog_cfg: &Config, sig_no: i32) -> u32 {
     let mut exit_code = 0;
 
     for pid in &prog_cfg.pids {
-        let res = unsafe { libc::kill(*pid as libc::pid_t, sig_no as i32) };
+        let res = unsafe { libc::kill(*pid as libc::pid_t, sig_no) };
         if res != 0 {
             let err = std::io::Error::last_os_error();
             eprintln!("kill pid {}: {}", pid, err);

text/comm.rs

@@ -92,15 +92,11 @@ fn comm_file(
     let mut want2 = true;
 
     loop {
-        if want1 && buf1.is_empty() {
-            if rdr1.read_line(&mut buf1)? == 0 {
-                want1 = false;
-            }
+        if want1 && buf1.is_empty() && rdr1.read_line(&mut buf1)? == 0 {
+            want1 = false;
         }
-        if want2 && buf2.is_empty() {
-            if rdr2.read_line(&mut buf2)? == 0 {
-                want2 = false;
-            }
+        if want2 && buf2.is_empty() && rdr2.read_line(&mut buf2)? == 0 {
+            want2 = false;
         }
 
         if buf1.is_empty() && buf2.is_empty() {

tree/chown.rs

@@ -72,7 +72,7 @@ enum ParseOwnerGroupResult {
 
 fn parse_owner_group(owner_group: &str) -> Result<ParseOwnerGroupResult, String> {
     if owner_group.is_empty() || owner_group == ":" {
-        return Ok(ParseOwnerGroupResult::EmptyOrColon);
+        Ok(ParseOwnerGroupResult::EmptyOrColon)
     } else {
         match owner_group.split_once(':') {
             None => {