Merge pull request #265 from rustcoreutils/cleanups

jgarzik · web-flow · commit cfb0aa7c04ef · 2024-09-28T02:27:56.000-04:00
Cleanups
diff --git a/file/dd.rs b/file/dd.rs
@@ -148,15 +148,15 @@ fn convert_swab(data: &mut [u8]) {
 fn convert_lcase(data: &mut [u8]) {
     for byte in data.iter_mut() {
         if *byte >= b'A' && *byte <= b'Z' {
-            *byte = *byte + 32;
+            *byte += 32;
         }
     }
 }
 
 fn convert_ucase(data: &mut [u8]) {
     for byte in data.iter_mut() {
         if *byte >= b'a' && *byte <= b'z' {
-            *byte = *byte - 32;
+            *byte -= 32;
         }
     }
 }
diff --git a/file/file.rs b/file/file.rs
@@ -484,7 +484,7 @@ impl RawMagicFileLine {
         let mut tf_val = u64::from_be_bytes(array_buf);
 
         if let Some(mask) = mask {
-            tf_val = mask & tf_val;
+            tf_val &= mask;
         }
 
         match &self.value {
diff --git a/file/split.rs b/file/split.rs
@@ -105,7 +105,7 @@ impl OutputState {
             if i == 0 {
                 break;
             }
-            i = i - 1;
+            i -= 1;
         }
 
         Err("maximum suffix reached")
@@ -141,7 +141,7 @@ impl OutputState {
     }
 
     fn incr_output(&mut self, n: u64) {
-        self.count = self.count + n;
+        self.count += n;
         assert!(self.count <= self.boundary);
 
         if self.count == self.boundary {
@@ -170,7 +170,7 @@ impl OutputState {
             let slice = &buf[consumed..consumed + wlen];
             self.write(slice)?;
 
-            consumed = consumed + wlen;
+            consumed += wlen;
 
             self.incr_output(wlen as u64);
         }
diff --git a/misc/test.rs b/misc/test.rs
@@ -182,16 +182,9 @@ fn parse_binary_op(s: &str) -> Option<BinOp> {
     }
 }
 
-fn parse_int(s: &str) -> i64 {
-    match s.parse::<i64>() {
-        Ok(i) => i,
-        Err(_) => 0,
-    }
-}
-
 fn eval_binary_int(op: &BinOp, s1: &str, s2: &str) -> bool {
-    let i1 = parse_int(s1);
-    let i2 = parse_int(s2);
+    let i1: i64 = s1.parse().unwrap_or(0);
+    let i2: i64 = s2.parse().unwrap_or(0);
 
     match op {
         BinOp::IntEq => i1 == i2,
diff --git a/plib/src/lzw.rs b/plib/src/lzw.rs
@@ -163,6 +163,7 @@ impl UnixLZWReader {
         }
     }
 
+    #[allow(clippy::assign_op_pattern)]
     fn getcode(&mut self) -> i32 {
         if self.clear || self.roffset >= self.size || self.free_ent > self.maxcode {
             // as free_ent represents the index of the next available entry that can be made
diff --git a/screen/stty.rs b/screen/stty.rs
@@ -307,7 +307,7 @@ fn set_ti_flag(
 
     // set flag bits (unless negation)
     if !negate {
-        newflags = newflags | val_set;
+        newflags |= val_set;
     }
 
     // commit flag bits to termio struct, if changed
@@ -461,7 +461,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {
         if operand.parse::<u64>().is_ok() {
             set_ti_speed(&mut ti, &speedmap, true, operand)?;
             set_ti_speed(&mut ti, &speedmap, false, operand)?;
-            idx = idx + 1;
+            idx += 1;
             continue;
         }
 
@@ -489,7 +489,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {
 
         let mut op_arg = String::new();
         if (flags & PARG) != 0 {
-            idx = idx + 1;
+            idx += 1;
 
             if idx == args.operands.len() {
                 let errstr = format!("Missing operand for {}", operand);
@@ -530,7 +530,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {
             }
         }
 
-        idx = idx + 1;
+        idx += 1;
     }
 
     // finally, commit new termio settings (if any)
diff --git a/text/asa.rs b/text/asa.rs
@@ -72,7 +72,7 @@ fn asa_file(pathname: &PathBuf) -> io::Result<()> {
     let mut state = AsaState::new();
 
     loop {
-        line_no = line_no + 1;
+        line_no += 1;
 
         let mut raw_line = String::new();
         let n_read = reader.read_line(&mut raw_line)?;
@@ -90,7 +90,7 @@ fn asa_file(pathname: &PathBuf) -> io::Result<()> {
         // exclude first char, and trailing newline
         let mut line_len = raw_line.len() - 1;
         if raw_line.ends_with('\n') {
-            line_len = line_len - 1;
+            line_len -= 1;
         }
         let line = &raw_line[1..line_len];
 
diff --git a/text/expand.rs b/text/expand.rs
@@ -57,7 +57,7 @@ fn parse_tablist(tablist: &str) -> Result<TabList, &'static str> {
 }
 
 fn space_out(column: &mut usize, writer: &mut BufWriter<dyn Write>) -> io::Result<()> {
-    *column = *column + 1;
+    *column += 1;
 
     writer.write_all(b" ")?;
 
@@ -89,14 +89,14 @@ fn expand_file(tablist: &TabList, pathname: &PathBuf) -> io::Result<()> {
                 // backspace
                 writer.write_all(&[byte])?;
                 if column > 1 {
-                    column = column - 1;
+                    column -= 1;
                 }
             } else if byte == b'\r' || byte == b'\n' {
                 writer.write_all(&[byte])?;
                 column = 1;
             } else if byte != b'\t' {
                 writer.write_all(&[byte])?;
-                column = column + 1;
+                column += 1;
             } else {
                 match tablist {
                     TabList::UniStop(n) => {
@@ -115,7 +115,7 @@ fn expand_file(tablist: &TabList, pathname: &PathBuf) -> io::Result<()> {
                             while column < next_tab {
                                 space_out(&mut column, &mut writer)?;
                             }
-                            cur_stop = cur_stop + 1;
+                            cur_stop += 1;
                             space_out(&mut column, &mut writer)?;
                         }
                     }
diff --git a/text/head.rs b/text/head.rs
@@ -56,10 +56,10 @@ fn head_file(args: &Args, pathname: &PathBuf, first: bool, want_header: bool) ->
         for chv in buf {
             // LF character encountered
             if *chv == 10 {
-                nl = nl + 1;
+                nl += 1;
             }
 
-            pos = pos + 1;
+            pos += 1;
 
             // if user-specified limit reached, stop
             if nl >= args.n {
diff --git a/text/pr_util/args.rs b/text/pr_util/args.rs
@@ -355,14 +355,10 @@ impl Parameters {
 
         let (first_page, last_page) = args.pages.unwrap_or((1, None));
 
-        let num_columns = {
-            if args.merge {
-                args.file.len()
-            } else if let Some(n) = args.columns {
-                n
-            } else {
-                1
-            }
+        let num_columns = if args.merge {
+            args.file.len()
+        } else {
+            args.columns.unwrap_or(1)
         };
 
         let form_feed = args.form_feed || args.form_feed_with_pause;
diff --git a/text/wc.rs b/text/wc.rs
@@ -138,7 +138,7 @@ fn wc_file_bytes(count: &mut CountInfo, pathname: &PathBuf, chars_mode: bool) ->
 
         if !chars_mode {
             // number of bytes read
-            count.chars = count.chars + n_read;
+            count.chars += n_read;
         } else {
             // number of UTF-8 unicode codepoints in this slice of bytes
             count.chars += bufslice.iter().filter(|&ch| (ch >> 6) != 0b10).count();
diff --git a/users/mesg.rs b/users/mesg.rs
@@ -87,6 +87,7 @@ fn parse_setting(setting: &str) -> Result<bool, &'static str> {
     }
 }
 
+#[allow(clippy::assign_op_pattern)]
 fn set_mesg(fd: i32, st: libc::stat, setting: &str) -> io::Result<()> {
     let res = parse_setting(setting);
     if let Err(e) = res {
diff --git a/xform/cksum.rs b/xform/cksum.rs
@@ -35,7 +35,7 @@ fn cksum_file(filename: &PathBuf) -> io::Result<()> {
     let mut file = plib::io::input_stream(filename, false)?;
 
     let mut buffer = [0; plib::BUFSZ];
-    let mut n_bytes: u64 = 0;
+    let mut n_bytes: usize = 0;
     let mut crc: u32 = 0;
 
     loop {
@@ -44,7 +44,7 @@ fn cksum_file(filename: &PathBuf) -> io::Result<()> {
             break;
         }
 
-        n_bytes = n_bytes + n_read as u64;
+        n_bytes += n_read;
         crc = crc32::update(crc, &buffer[0..n_read]);
     }
 
@@ -57,7 +57,7 @@ fn cksum_file(filename: &PathBuf) -> io::Result<()> {
     };
     println!(
         "{} {}{}{}",
-        crc32::finalize(crc, n_bytes as usize),
+        crc32::finalize(crc, n_bytes),
         n_bytes,
         filename_prefix,
         filename.display()
diff --git a/xform/crc32.rs b/xform/crc32.rs
@@ -64,7 +64,7 @@ pub fn finalize(crc_in: u32, n_in: usize) -> u32 {
 
     while n != 0 {
         let c = (n & 0o377) as u32;
-        n = n >> 8;
+        n >>= 8;
         s = (s << 8) ^ CRCTAB[(((s >> 24) ^ c) & 0xff) as usize];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -148,15 +148,15 @@ fn convert_swab(data: &mut [u8]) {`
`148`	`148`	`fn convert_lcase(data: &mut [u8]) {`
`149`	`149`	`for byte in data.iter_mut() {`
`150`	`150`	`if byte >= b'A' && byte <= b'Z' {`
`151`		`- byte = byte + 32;`
	`151`	`+ *byte += 32;`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`fn convert_ucase(data: &mut [u8]) {`
`157`	`157`	`for byte in data.iter_mut() {`
`158`	`158`	`if byte >= b'a' && byte <= b'z' {`
`159`		`- byte = byte - 32;`
	`159`	`+ *byte -= 32;`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ impl RawMagicFileLine {`
`484`	`484`	`let mut tf_val = u64::from_be_bytes(array_buf);`
`485`	`485`
`486`	`486`	`if let Some(mask) = mask {`
`487`		`- tf_val = mask & tf_val;`
	`487`	`+ tf_val &= mask;`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`match &self.value {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ impl OutputState {`
`105`	`105`	`if i == 0 {`
`106`	`106`	`break;`
`107`	`107`	`}`
`108`		`- i = i - 1;`
	`108`	`+ i -= 1;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`Err("maximum suffix reached")`
`@@ -141,7 +141,7 @@ impl OutputState {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`fn incr_output(&mut self, n: u64) {`
`144`		`- self.count = self.count + n;`
	`144`	`+ self.count += n;`
`145`	`145`	`assert!(self.count <= self.boundary);`
`146`	`146`
`147`	`147`	`if self.count == self.boundary {`
`@@ -170,7 +170,7 @@ impl OutputState {`
`170`	`170`	`let slice = &buf[consumed..consumed + wlen];`
`171`	`171`	`self.write(slice)?;`
`172`	`172`
`173`		`- consumed = consumed + wlen;`
	`173`	`+ consumed += wlen;`
`174`	`174`
`175`	`175`	`self.incr_output(wlen as u64);`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ impl UnixLZWReader {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
	`166`	`+ #[allow(clippy::assign_op_pattern)]`
`166`	`167`	`fn getcode(&mut self) -> i32 {`
`167`	`168`	`if self.clear \|\| self.roffset >= self.size \|\| self.free_ent > self.maxcode {`
`168`	`169`	`// as free_ent represents the index of the next available entry that can be made`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ fn set_ti_flag(`
`307`	`307`
`308`	`308`	`// set flag bits (unless negation)`
`309`	`309`	`if !negate {`
`310`		`- newflags = newflags \| val_set;`
	`310`	`+ newflags \|= val_set;`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`// commit flag bits to termio struct, if changed`
`@@ -461,7 +461,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {`
`461`	`461`	`if operand.parse::<u64>().is_ok() {`
`462`	`462`	`set_ti_speed(&mut ti, &speedmap, true, operand)?;`
`463`	`463`	`set_ti_speed(&mut ti, &speedmap, false, operand)?;`
`464`		`- idx = idx + 1;`
	`464`	`+ idx += 1;`
`465`	`465`	`continue;`
`466`	`466`	`}`
`467`	`467`
`@@ -489,7 +489,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {`
`489`	`489`
`490`	`490`	`let mut op_arg = String::new();`
`491`	`491`	`if (flags & PARG) != 0 {`
`492`		`- idx = idx + 1;`
	`492`	`+ idx += 1;`
`493`	`493`
`494`	`494`	`if idx == args.operands.len() {`
`495`	`495`	`let errstr = format!("Missing operand for {}", operand);`
`@@ -530,7 +530,7 @@ fn stty_set_long(mut ti: Termios, args: &Args) -> io::Result<()> {`
`530`	`530`	`}`
`531`	`531`	`}`
`532`	`532`
`533`		`- idx = idx + 1;`
	`533`	`+ idx += 1;`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`// finally, commit new termio settings (if any)`