Merge pull request #6636 from BenWiederhake/dev-newest-clippy

cakebaker · web-flow · commit e8f14c76fac4 · 2024-08-12T14:22:23.000+02:00
dircolors+join+sleep: optimize int and string ops as required by clippy nightly
diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs
@@ -469,7 +469,7 @@ fn escape(s: &str) -> String {
         match c {
             '\'' => result.push_str("'\\''"),
             ':' if previous != '\\' => result.push_str("\\:"),
-            _ => result.push_str(&c.to_string()),
+            _ => result.push(c),
         }
         previous = c;
     }
diff --git a/src/uu/join/src/join.rs b/src/uu/join/src/join.rs
@@ -654,7 +654,7 @@ fn parse_settings(matches: &clap::ArgMatches) -> UResult<Settings> {
             settings.autoformat = true;
         } else {
             let mut specs = vec![];
-            for part in format.split(|c| c == ' ' || c == ',' || c == '\t') {
+            for part in format.split([' ', ',', '\t']) {
                 specs.push(Spec::parse(part)?);
             }
             settings.format = specs;
diff --git a/tests/by-util/test_sleep.rs b/tests/by-util/test_sleep.rs
@@ -138,7 +138,7 @@ fn test_sleep_wrong_time() {
 #[test]
 fn test_sleep_when_single_input_exceeds_max_duration_then_no_error() {
     let mut child = new_ucmd!()
-        .arg(format!("{}", u64::MAX as u128 + 1))
+        .arg(format!("{}", u128::from(u64::MAX) + 1))
         .timeout(Duration::from_secs(10))
         .run_no_wait();
 

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ fn parse_settings(matches: &clap::ArgMatches) -> UResult<Settings> {`
`654`	`654`	`settings.autoformat = true;`
`655`	`655`	`} else {`
`656`	`656`	`let mut specs = vec![];`
`657`		`- for part in format.split(\|c\| c == ' ' \|\| c == ',' \|\| c == '\t') {`
	`657`	`+ for part in format.split([' ', ',', '\t']) {`
`658`	`658`	`specs.push(Spec::parse(part)?);`
`659`	`659`	`}`
`660`	`660`	`settings.format = specs;`