From 7784a252f27e19bb12cb34feb4394f96b7d10c1a Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 14 Nov 2021 13:18:45 -0600 Subject: [PATCH] fix/yes ~ revise to match 'nix' changes --- src/uu/yes/src/splice.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/uu/yes/src/splice.rs b/src/uu/yes/src/splice.rs index 6f025d6a9..84bd1cc24 100644 --- a/src/uu/yes/src/splice.rs +++ b/src/uu/yes/src/splice.rs @@ -55,16 +55,13 @@ type Result = std::result::Result; impl From for Error { fn from(error: nix::Error) -> Self { - match error { - nix::Error::Sys(errno) => Error::Io(io::Error::from_raw_os_error(errno as i32)), - _ => Error::Io(io::Error::last_os_error()), - } + Error::Io(io::Error::from_raw_os_error(error as i32)) } } fn maybe_unsupported(error: nix::Error) -> Error { - match error.as_errno() { - Some(Errno::EINVAL) | Some(Errno::ENOSYS) | Some(Errno::EBADF) => Error::Unsupported, + match error { + Errno::EINVAL | Errno::ENOSYS | Errno::EBADF => Error::Unsupported, _ => error.into(), } }