From 1e78a40e20603f66e6d3da9b58bf346a3d3087f0 Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Mon, 30 Aug 2021 23:13:31 +0200
Subject: [PATCH 1/2] CICD: use nightly rust for code coverage

---
 .github/workflows/CICD.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index d7dd4ad97..4f92d7d73 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -14,7 +14,6 @@ env:
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
   RUST_MIN_SRV: "1.47.0" ## MSRV v1.47.0
-  RUST_COV_SRV: "2021-05-06" ## (~v1.52.0) supported rust version for code coverage; (date required/used by 'coverage') ## !maint: refactor when code coverage support is included in the stable channel
 
 on: [push, pull_request]
 
@@ -606,7 +605,7 @@ jobs:
         ## VARs setup
         outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
         # toolchain
-        TOOLCHAIN="nightly-${{ env.RUST_COV_SRV }}" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
+        TOOLCHAIN="nightly" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
         # * specify gnu-type TOOLCHAIN for windows; `grcov` requires gnu-style code coverage data files
         case ${{ matrix.job.os }} in windows-*) TOOLCHAIN="$TOOLCHAIN-x86_64-pc-windows-gnu" ;; esac;
         # * use requested TOOLCHAIN if specified

From b82401e744e0b588c8c86dad19633c0dd5c946e2 Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Tue, 31 Aug 2021 00:36:35 +0200
Subject: [PATCH 2/2] uucore: fall back to stripping the error message for
 unexpected io error kinds

Rust recently added new error kinds, which causes tests to fail on beta/nightly.
However, we can't match for these new error kinds because they are marked as unstable.
As a workaround we call `.to_string()` on the original error and strip
the ` (os error XX)` bit. The downside of this is that
the error messages are not capitalized.
---
 src/uucore/src/lib/mods/error.rs | 58 +++++++++++++++++---------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/uucore/src/lib/mods/error.rs b/src/uucore/src/lib/mods/error.rs
index 6af934d3e..9a697d822 100644
--- a/src/uucore/src/lib/mods/error.rs
+++ b/src/uucore/src/lib/mods/error.rs
@@ -368,7 +368,7 @@ impl UIoError {
     pub fn new<S: Into<String>>(kind: std::io::ErrorKind, context: S) -> Box<dyn UError> {
         Box::new(Self {
             context: context.into(),
-            inner: std::io::Error::new(kind, ""),
+            inner: kind.into(),
         })
     }
 }
@@ -380,32 +380,36 @@ impl Error for UIoError {}
 impl Display for UIoError {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         use std::io::ErrorKind::*;
-        write!(
-            f,
-            "{}: {}",
-            self.context,
-            match self.inner.kind() {
-                NotFound => "No such file or directory",
-                PermissionDenied => "Permission denied",
-                ConnectionRefused => "Connection refused",
-                ConnectionReset => "Connection reset",
-                ConnectionAborted => "Connection aborted",
-                NotConnected => "Not connected",
-                AddrInUse => "Address in use",
-                AddrNotAvailable => "Address not available",
-                BrokenPipe => "Broken pipe",
-                AlreadyExists => "Already exists",
-                WouldBlock => "Would block",
-                InvalidInput => "Invalid input",
-                InvalidData => "Invalid data",
-                TimedOut => "Timed out",
-                WriteZero => "Write zero",
-                Interrupted => "Interrupted",
-                Other => "Other",
-                UnexpectedEof => "Unexpected end of file",
-                _ => panic!("Unexpected io error: {}", self.inner),
-            },
-        )
+
+        let message;
+        let message = match self.inner.kind() {
+            NotFound => "No such file or directory",
+            PermissionDenied => "Permission denied",
+            ConnectionRefused => "Connection refused",
+            ConnectionReset => "Connection reset",
+            ConnectionAborted => "Connection aborted",
+            NotConnected => "Not connected",
+            AddrInUse => "Address in use",
+            AddrNotAvailable => "Address not available",
+            BrokenPipe => "Broken pipe",
+            AlreadyExists => "Already exists",
+            WouldBlock => "Would block",
+            InvalidInput => "Invalid input",
+            InvalidData => "Invalid data",
+            TimedOut => "Timed out",
+            WriteZero => "Write zero",
+            Interrupted => "Interrupted",
+            Other => "Other",
+            UnexpectedEof => "Unexpected end of file",
+            _ => {
+                // TODO: using `strip_errno()` causes the error message
+                // to not be capitalized. When the new error variants (https://github.com/rust-lang/rust/issues/86442)
+                // are stabilized, we should add them to the match statement.
+                message = strip_errno(&self.inner);
+                &message
+            }
+        };
+        write!(f, "{}: {}", self.context, message,)
     }
 }