cp: fix test failures

Author: vikram-kangotra

src/uu/cp/src/cp.rs

@@ -52,7 +52,7 @@ pub enum CpError {
     IoErr(#[from] io::Error),
 
     /// Wrapper for io::Error with path context
-    #[error("Reading from input {1} gave error")]
+    #[error("{1}: {0}")]
     IoErrContext(io::Error, String),
 
     /// General copy error
@@ -69,7 +69,7 @@ pub enum CpError {
     WalkDirErr(#[from] walkdir::Error),
 
     /// Simple std::path::StripPrefixError wrapper
-    #[error("{0}")]
+    #[error(transparent)]
     StripPrefixError(#[from] StripPrefixError),
 
     /// Result of a skipped file
@@ -1789,19 +1789,19 @@ fn symlink_file(
 ) -> CopyResult<()> {
     #[cfg(not(windows))]
     {
-        std::os::unix::fs::symlink(source, dest).map_err(|_| CpError::Error(format!(
+        std::os::unix::fs::symlink(source, dest).map_err(|e| CpError::IoErrContext(e, format!(
             "cannot create symlink {} to {}",
             get_filename(dest).unwrap_or("invalid file name").quote(),
             get_filename(source).unwrap_or("invalid file name").quote()
         )))?;
     }
     #[cfg(windows)]
     {
-        std::os::windows::fs::symlink_file(source, dest).context(format!(
+        std::os::windows::fs::symlink_file(source, dest).map_err(|e| CpError::IoErrContext(e, format!(
             "cannot create symlink {} to {}",
             get_filename(dest).unwrap_or("invalid file name").quote(),
             get_filename(source).unwrap_or("invalid file name").quote()
-        ))?;
+        )))?;
     }
     if let Ok(file_info) = FileInformation::from_path(dest, false) {
         symlinked_files.insert(file_info);
@@ -1976,7 +1976,7 @@ fn delete_dest_if_needed_and_allowed(
                                 &FileInformation::from_path(
                                     source,
                                     options.dereference(source_in_command_line)
-                                ).map_err(|_| CpError::Error(format!("cannot stat {}", source.quote())))?
+                                ).map_err(|e| CpError::IoErrContext(e, format!("cannot stat {}", source.quote())))?
                             )
                 }
             }
@@ -2117,7 +2117,7 @@ fn handle_copy_mode(
             } else {
                 fs::hard_link(source, dest)
             }
-            .map_err(|_| CpError::Error(format!(
+            .map_err(|e| CpError::IoErrContext(e, format!(
                 "cannot create hard link {} to {}",
                 get_filename(dest).unwrap_or("invalid file name").quote(),
                 get_filename(source).unwrap_or("invalid file name").quote()
@@ -2397,7 +2397,7 @@ fn copy_file(
         // in the destination tree.
         if let Some(new_source) = copied_files.get(
             &FileInformation::from_path(source, options.dereference(source_in_command_line))
-                .map_err(|_| CpError::Error(format!("cannot stat {}", source.quote())))?,
+                .map_err(|e| CpError::IoErrContext(e, format!("cannot stat {}", source.quote())))?,
         ) {
             fs::hard_link(new_source, dest)?;
 

src/uu/cp/src/platform/macos.rs

@@ -12,7 +12,7 @@ use std::path::Path;
 use uucore::buf_copy;
 use uucore::mode::get_umask;
 
-use crate::{CopyDebug, CopyResult, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
+use crate::{CopyDebug, CopyResult, CpError, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
 
 /// Copies `source` to `dest` using copy-on-write if possible.
 ///
@@ -103,14 +103,14 @@ pub(crate) fn copy_on_write(
 
                     let context = buf_copy::copy_stream(&mut src_file, &mut dst_file)
                         .map_err(|_| std::io::Error::from(std::io::ErrorKind::Other))
-                        .context(context)?;
+                        .map_err(|e| CpError::IoErrContext(e, context.to_owned())?;
 
                     if source_is_fifo {
                         dst_file.set_permissions(src_file.metadata()?.permissions())?;
                     }
                     context
                 } else {
-                    fs::copy(source, dest).context(context)?
+                    fs::copy(source, dest).map_err(|e| CpError::IoErrContext(e, context.to_owned())?;
                 }
             }
         };

src/uu/cp/src/platform/other.rs

@@ -6,7 +6,7 @@
 use std::fs;
 use std::path::Path;
 
-use crate::{CopyDebug, CopyResult, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
+use crate::{CopyDebug, CopyResult, CpError, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
 
 /// Copies `source` to `dest` for systems without copy-on-write
 pub(crate) fn copy_on_write(
@@ -29,7 +29,7 @@ pub(crate) fn copy_on_write(
         reflink: OffloadReflinkDebug::Unsupported,
         sparse_detection: SparseDebug::Unsupported,
     };
-    fs::copy(source, dest).context(context)?;
+    fs::copy(source, dest).map_err(|e| CpError::IoErrContext(e, context.to_owned())?;
 
     Ok(copy_debug)
 }

src/uu/cp/src/platform/other_unix.rs

@@ -10,7 +10,7 @@ use std::path::Path;
 use uucore::buf_copy;
 use uucore::mode::get_umask;
 
-use crate::{CopyDebug, CopyResult, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
+use crate::{CopyDebug, CopyResult, CpError, OffloadReflinkDebug, ReflinkMode, SparseDebug, SparseMode};
 
 /// Copies `source` to `dest` for systems without copy-on-write
 pub(crate) fn copy_on_write(
@@ -47,15 +47,15 @@ pub(crate) fn copy_on_write(
 
         buf_copy::copy_stream(&mut src_file, &mut dst_file)
             .map_err(|_| std::io::Error::from(std::io::ErrorKind::Other))
-            .context(context)?;
+            .map_err(|e| CpError::IoErrContext(e, context.to_owned())?;
 
         if source_is_fifo {
             dst_file.set_permissions(src_file.metadata()?.permissions())?;
         }
         return Ok(copy_debug);
     }
 
-    fs::copy(source, dest).context(context)?;
+    fs::copy(source, dest).map_err(|e| CpError::IoErrContext(e, context.to_owned())?;
 
     Ok(copy_debug)
 }