Merge branch 'main' into rm_4

.github/workflows/CICD.yml

@@ -482,6 +482,7 @@ jobs:
           - { os: windows-latest , target: i686-pc-windows-msvc        , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-gnu       , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-msvc      , features: feat_os_windows }
+          - { os: windows-latest , target: aarch64-pc-windows-msvc     , features: feat_os_windows, use-cross: use-cross , skip-tests: true }
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master

Cargo.toml

@@ -322,7 +322,7 @@ rand_core = "0.6.4"
 rayon = "1.10"
 redox_syscall = "0.5.1"
 regex = "1.10.4"
-rstest = "0.21.0"
+rstest = "0.22.0"
 rust-ini = "0.21.0"
 same-file = "1.0.6"
 self_cell = "1.0.4"

fuzz/Cargo.toml

@@ -10,7 +10,7 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4.7"
 libc = "0.2.153"
-tempfile = "3.10.1"
+tempfile = "3.11.0"
 rand = { version = "0.8.5", features = ["small_rng"] }
 similar = "2.5.0"
 

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;
     }

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;

src/uu/test/src/error.rs

@@ -11,6 +11,7 @@ pub enum ParseError {
     MissingArgument(String),
     UnknownOperator(String),
     InvalidInteger(String),
+    UnaryOperatorExpected(String),
 }
 
 /// A Result type for parsing test expressions
@@ -26,6 +27,7 @@ impl std::fmt::Display for ParseError {
             Self::ExtraArgument(s) => write!(f, "extra argument {s}"),
             Self::UnknownOperator(s) => write!(f, "unknown operator {s}"),
             Self::InvalidInteger(s) => write!(f, "invalid integer {s}"),
+            Self::UnaryOperatorExpected(op) => write!(f, "{op}: unary operator expected"),
         }
     }
 }