Merge pull request #7691 from nyurik/commas

chore: cleanup trailing commas before parens

Author: cakebaker

fuzz/fuzz_targets/fuzz_common/mod.rs

@@ -331,19 +331,19 @@ pub fn compare_result(
 
     if rust_result.stdout.trim() != gnu_result.stdout.trim() {
         discrepancies.push("stdout differs");
-        println!("Rust stdout:",);
+        println!("Rust stdout:");
         print_or_empty(rust_result.stdout.as_str());
-        println!("GNU stdout:",);
+        println!("GNU stdout:");
         print_or_empty(gnu_result.stdout.as_ref());
         print_diff(&rust_result.stdout, &gnu_result.stdout);
         should_panic = true;
     }
 
     if rust_result.stderr.trim() != gnu_result.stderr.trim() {
         discrepancies.push("stderr differs");
-        println!("Rust stderr:",);
+        println!("Rust stderr:");
         print_or_empty(rust_result.stderr.as_str());
-        println!("GNU stderr:",);
+        println!("GNU stderr:");
         print_or_empty(gnu_result.stderr.as_str());
         print_diff(&rust_result.stderr, &gnu_result.stderr);
         if fail_on_stderr_diff {

src/uu/base32/src/base_common.rs

@@ -50,7 +50,7 @@ impl Config {
                 if let Some(extra_op) = values.next() {
                     return Err(UUsageError::new(
                         BASE_CMD_PARSE_ERROR,
-                        format!("extra operand {}", extra_op.quote(),),
+                        format!("extra operand {}", extra_op.quote()),
                     ));
                 }
 

src/uu/basename/src/basename.rs

@@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             _ => {
                 return Err(UUsageError::new(
                     1,
-                    format!("extra operand {}", name_args[2].quote(),),
+                    format!("extra operand {}", name_args[2].quote()),
                 ));
             }
         }

src/uu/dd/src/blocks.rs

@@ -315,15 +315,15 @@ mod tests {
         let buf = [0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8];
         let res = unblock(&buf, 8);
 
-        assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, NEWLINE],);
+        assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, NEWLINE]);
     }
 
     #[test]
     fn unblock_test_all_space() {
         let buf = [SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE];
         let res = unblock(&buf, 8);
 
-        assert_eq!(res, vec![NEWLINE],);
+        assert_eq!(res, vec![NEWLINE]);
     }
 
     #[test]
@@ -342,7 +342,7 @@ mod tests {
         let buf = [0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE];
         let res = unblock(&buf, 8);
 
-        assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, NEWLINE],);
+        assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, NEWLINE]);
     }
 
     #[test]

src/uu/dd/src/parseargs/unit_tests.rs

@@ -157,7 +157,7 @@ fn test_all_top_level_args_no_leading_dashes() {
     );
 
     // no conv flags apply to output
-    assert_eq!(settings.oconv, OConvFlags::default(),);
+    assert_eq!(settings.oconv, OConvFlags::default());
 
     // iconv=count_bytes,skip_bytes
     assert_eq!(

src/uu/expr/src/syntax_tree.rs

@@ -784,7 +784,7 @@ mod test {
             AstNode::parse(&["index", "1", "2"]),
             Ok(op(BinOp::String(StringOp::Index), "1", "2")),
         );
-        assert_eq!(AstNode::parse(&["length", "1"]), Ok(length("1")),);
+        assert_eq!(AstNode::parse(&["length", "1"]), Ok(length("1")));
         assert_eq!(
             AstNode::parse(&["substr", "1", "2", "3"]),
             Ok(substr("1", "2", "3")),

src/uu/pathchk/src/pathchk.rs

@@ -197,7 +197,7 @@ fn check_default(path: &[String]) -> bool {
         // but some non-POSIX hosts do (as an alias for "."),
         // so allow "" if `symlink_metadata` (corresponds to `lstat`) does.
         if fs::symlink_metadata(&joined_path).is_err() {
-            writeln!(std::io::stderr(), "pathchk: '': No such file or directory",);
+            writeln!(std::io::stderr(), "pathchk: '': No such file or directory");
             return false;
         }
     }

src/uu/sort/src/sort.rs

@@ -1946,7 +1946,7 @@ mod tests {
     #[test]
     fn test_tokenize_fields() {
         let line = "foo bar b    x";
-        assert_eq!(tokenize_helper(line, None), vec![0..3, 3..7, 7..9, 9..14,],);
+        assert_eq!(tokenize_helper(line, None), vec![0..3, 3..7, 7..9, 9..14,]);
     }
 
     #[test]

src/uu/stty/src/flags.rs

@@ -279,7 +279,7 @@ pub const BAUD_RATES: &[(&str, BaudRate)] = &[
     ("500000", BaudRate::B500000),
     #[cfg(any(target_os = "android", target_os = "linux"))]
     ("576000", BaudRate::B576000),
-    #[cfg(any(target_os = "android", target_os = "linux",))]
+    #[cfg(any(target_os = "android", target_os = "linux"))]
     ("921600", BaudRate::B921600),
     #[cfg(any(target_os = "android", target_os = "linux"))]
     ("1000000", BaudRate::B1000000),

src/uu/tr/src/tr.rs

@@ -85,7 +85,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                     "{start} {op}\nOnly one string may be given when deleting without squeezing repeats.",
                 )
             } else {
-                format!("{start} {op}",)
+                format!("{start} {op}")
             };
             return Err(UUsageError::new(1, msg));
         }