mv: gnu test case part-hardlink fix

src/uu/cp/src/cp.rs

@@ -29,7 +29,7 @@ use platform::copy_on_write;
 use uucore::display::Quotable;
 use uucore::error::{set_exit_code, UClapError, UError, UResult, UUsageError};
 use uucore::fs::{
-    are_hardlinks_to_same_file, canonicalize, get_filename, is_symlink_loop,
+    are_hardlinks_to_same_file, canonicalize, disk_usage, get_filename, is_symlink_loop,
     path_ends_with_terminator, paths_refer_to_same_file, FileInformation, MissingHandling,
     ResolveMode,
 };
@@ -2447,42 +2447,6 @@ pub fn localize_to_target(root: &Path, source: &Path, target: &Path) -> CopyResu
     Ok(target.join(local_to_root))
 }
 
-/// Get the total size of a slice of files and directories.
-///
-/// This function is much like the `du` utility, by recursively getting the sizes of files in directories.
-/// Files are not deduplicated when appearing in multiple sources. If `recursive` is set to `false`, the
-/// directories in `paths` will be ignored.
-fn disk_usage(paths: &[PathBuf], recursive: bool) -> io::Result<u64> {
-    let mut total = 0;
-    for p in paths {
-        let md = fs::metadata(p)?;
-        if md.file_type().is_dir() {
-            if recursive {
-                total += disk_usage_directory(p)?;
-            }
-        } else {
-            total += md.len();
-        }
-    }
-    Ok(total)
-}
-
-/// A helper for `disk_usage` specialized for directories.
-fn disk_usage_directory(p: &Path) -> io::Result<u64> {
-    let mut total = 0;
-
-    for entry in fs::read_dir(p)? {
-        let entry = entry?;
-        if entry.file_type()?.is_dir() {
-            total += disk_usage_directory(&entry.path())?;
-        } else {
-            total += entry.metadata()?.len();
-        }
-    }
-
-    Ok(total)
-}
-
 #[cfg(test)]
 mod tests {
 

src/uu/mv/Cargo.toml

@@ -20,13 +20,20 @@ path = "src/mv.rs"
 clap = { workspace = true }
 fs_extra = { workspace = true }
 indicatif = { workspace = true }
+walkdir = { workspace = true }
+filetime = { workspace = true }
 uucore = { workspace = true, features = [
   "backup-control",
   "fs",
   "fsxattr",
   "update-control",
+  "perms",
+  "entries",
 ] }
 
+[dev-dependencies]
+tempfile = { workspace = true }
+
 [[bin]]
 name = "mv"
 path = "src/main.rs"

src/uu/mv/src/error.rs

@@ -7,6 +7,8 @@
 
 use uucore::error::UError;
 
+use fs_extra::error::Error as FsXError;
+
 #[derive(Debug)]
 pub enum MvError {
     NoSuchFile(String),
@@ -19,6 +21,8 @@
     NotADirectory(String),
     TargetNotADirectory(String),
     FailedToAccessNotADirectory(String),
+    FsXError(FsXError),
+    NotAllFilesMoved,
 }
 
 impl Error for MvError {}
@@ -49,6 +53,18 @@
             Self::FailedToAccessNotADirectory(t) => {
                 write!(f, "failed to access {t}: Not a directory")
             }
+            Self::FsXError(err) => {
+                write!(f, "{err}")
+            }
+            Self::NotAllFilesMoved => {
+                write!(f, "failed to move all files")
+            }
         }
     }
 }
+
+impl From<FsXError> for MvError {
+    fn from(err: FsXError) -> Self {
+        Self::FsXError(err)
+    }
+}