Merge branch 'uutils:main' into feat--sdiff-inital-with-parser

Author: GunterSchmidt

Cargo.lock

@@ -217,7 +217,7 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
             std::process::exit(0);
         }
         if param_str.starts_with('-') {
-            return Err(format!("unrecognized option: {param:?}"));
+            return Err(format!("unrecognized option '{}'", param.to_string_lossy()));
         }
         if from.is_none() {
             from = Some(param);

src/cmp.rs

@@ -195,7 +195,7 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
             Err(error) => return Err(error),
         }
         if param.to_string_lossy().starts_with('-') {
-            return Err(format!("unrecognized option: {param:?}"));
+            return Err(format!("unrecognized option '{}'", param.to_string_lossy()));
         }
         if from.is_none() {
             from = Some(param);

src/params.rs

@@ -39,9 +39,7 @@ mod common {
             cmd.assert()
                 .code(predicate::eq(2))
                 .failure()
-                .stderr(predicate::str::starts_with(
-                    "unrecognized option: \"--foobar\"",
-                ));
+                .stderr(predicate::str::contains("unrecognized option '--foobar'"));
         }
         Ok(())
     }