refactor: error handling in buf_copy

Author: xtqqczze

src/uucore/src/lib/features/buf_copy.rs

@@ -9,8 +9,6 @@
 //! used by utilities to work around the limitations of Rust's `fs::copy` which
 //! does not handle copying special files (e.g pipes, character/block devices).
 
-pub mod common;
-
 #[cfg(any(target_os = "linux", target_os = "android"))]
 pub mod linux;
 #[cfg(any(target_os = "linux", target_os = "android"))]

…core/src/lib/features/buf_copy/common.rs …ucore/src/lib/features/buf_copy/error.rssrc/uucore/src/lib/features/buf_copy/common.rs renamed to src/uucore/src/lib/features/buf_copy/error.rs src/uucore/src/lib/features/buf_copy/common.rs renamed to src/uucore/src/lib/features/buf_copy/error.rs

@@ -9,26 +9,22 @@ use crate::error::UError;
 #[derive(Debug)]
 pub enum Error {
     Io(std::io::Error),
-    WriteError(String),
+}
+
+impl From<rustix::io::Errno> for Error {
+    fn from(value: rustix::io::Errno) -> Self {
+        Self::Io(value.into())
+    }
 }
 
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::WriteError(msg) => write!(f, "splice() write error: {msg}"),
             Self::Io(err) => write!(f, "I/O error: {err}"),
         }
     }
 }
 
 impl std::error::Error for Error {}
 
-impl UError for Error {
-    fn code(&self) -> i32 {
-        1
-    }
-
-    fn usage(&self) -> bool {
-        false
-    }
-}
+impl UError for Error {}

src/uucore/src/lib/features/buf_copy/linux.rs

@@ -13,7 +13,7 @@ use std::{
     os::fd::{AsFd, AsRawFd},
 };
 
-use super::common::Error;
+use super::error::Error;
 
 /// A readable file descriptor.
 pub trait FdReadable: Read + AsRawFd + AsFd {}
@@ -25,13 +25,6 @@ pub trait FdWritable: Write + AsFd + AsRawFd {}
 
 impl<T> FdWritable for T where T: Write + AsFd + AsRawFd {}
 
-/// Conversion from a `rustix::io::Errno` into our `Error` which implements `UError`.
-impl From<rustix::io::Errno> for Error {
-    fn from(error: rustix::io::Errno) -> Self {
-        Self::Io(std::io::Error::from(error))
-    }
-}
-
 /// Copy data from `Read` implementor `source` into a `Write` implementor
 /// `dest`. This works by reading a chunk of data from `source` and writing the
 /// data to `dest` in a loop.