Merge pull request #2494 from sylvestre/clip2

fix various clippy & rustfmt issues

src/uu/du/src/du.rs

@@ -5,6 +5,9 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
+// Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+#![allow(clippy::nonstandard_macro_braces)]
+
 #[macro_use]
 extern crate uucore;
 
@@ -416,26 +419,22 @@ impl Display for DuError {
             DuError::SummarizeDepthConflict(s) => {
                 write!(f, "summarizing conflicts with --max-depth={}", s)
             }
-            DuError::InvalidTimeStyleArg(s) => {
+            DuError::InvalidTimeStyleArg(s) => write!(
-                write!(
+                f,
-                    f,
+                "invalid argument '{}' for 'time style'
-                    "invalid argument '{}' for 'time style'
 Valid arguments are:
 - 'full-iso'
 - 'long-iso'
 - 'iso'
 Try '{} --help' for more information.",
-                    s, NAME
+                s, NAME
-                )
+            ),
-            }
+            DuError::InvalidTimeArg(s) => write!(
-            DuError::InvalidTimeArg(s) => {
+                f,
-                write!(
+                "Invalid argument '{}' for --time.
-                    f,
-                    "Invalid argument '{}' for --time.
 'birth' and 'creation' arguments are not supported on this platform.",
-                    s
+                s
-                )
+            ),
-            }
         }
     }
 }

src/uu/tr/src/tr.rs

@@ -233,10 +233,9 @@ fn get_usage() -> String {
 }
 
 fn get_long_usage() -> String {
-    format!(
+    "Translate, squeeze, and/or delete characters from standard input,
-        "Translate, squeeze, and/or delete characters from standard input,
+writing to standard output."
-writing to standard output.",
+        .to_string()
-    )
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {

tests/by-util/test_whoami.rs

@@ -39,7 +39,6 @@ fn test_normal_compare_env() {
     let whoami = whoami();
     if whoami == "nobody" {
         println!("test skipped:");
-        return;
     } else if !is_ci() {
         new_ucmd!().succeeds().stdout_is(format!("{}\n", whoami));
     } else {

tests/common/util.rs

@@ -1065,7 +1065,7 @@ pub fn whoami() -> String {
 
 /// Add prefix 'g' for `util_name` if not on linux
 #[cfg(unix)]
-pub fn host_name_for<'a>(util_name: &'a str) -> Cow<'a, str> {
+pub fn host_name_for(util_name: &str) -> Cow<str> {
     // In some environments, e.g. macOS/freebsd, the GNU coreutils are prefixed with "g"
     // to not interfere with the BSD counterparts already in `$PATH`.
     #[cfg(not(target_os = "linux"))]