Merge branch 'master' of https://github.com/uutils/coreutils into hbina-tr-reimplement-expansion

tests/by-util/test_uniq.rs

@@ -145,7 +145,9 @@ fn test_invalid_utf8() {
         .arg("not-utf8-sequence.txt")
         .run()
         .failure()
-        .stderr_only("uniq: invalid utf-8 sequence of 1 bytes from index 0");
+        .stderr_only(
+            "uniq: failed to convert line to utf8: invalid utf-8 sequence of 1 bytes from index 0",
+        );
 }
 
 #[test]

tests/test_util_name.rs

@@ -1,3 +1,4 @@
+#![allow(unused_imports)]
 mod common;
 
 use common::util::TestScenario;
@@ -25,6 +26,7 @@ fn execution_phrase_double() {
 
 #[test]
 #[cfg(feature = "ls")]
+#[cfg(any(unix, windows))]
 fn execution_phrase_single() {
     use std::process::Command;
 
@@ -63,6 +65,7 @@ fn util_name_double() {
 
 #[test]
 #[cfg(feature = "sort")]
+#[cfg(any(unix, windows))]
 fn util_name_single() {
     use std::{
         io::Write,