temp commit

src/uu/cp/src/cp.rs

@@ -29,7 +29,9 @@ 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, disk_usage, get_filename, is_symlink_loop, path_ends_with_terminator, paths_refer_to_same_file, FileInformation, MissingHandling, ResolveMode
+    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,
 };
 use uucore::{backup_control, update_control};
 // These are exposed for projects (e.g. nushell) that want to create an `Options` value, which

src/uu/mv/src/mv.rs

@@ -737,7 +737,7 @@ fn rename_with_fallback(
                         "Permission denied",
                     )),
                     MvError::NotAllFilesMoved => {
-                        Err(io::Error::new(io::ErrorKind::Other, format!("")))
+                        Err(io::Error::new(io::ErrorKind::Other, String::new()))
                     }
                     _ => Err(io::Error::new(io::ErrorKind::Other, format!("{err:?}"))),
                 };
@@ -1010,7 +1010,7 @@ fn copy_metadata(src: &Path, dest: &Path, src_metadata: &fs::Metadata) -> io::Re
                 level: VerbosityLevel::Silent,
             },
         )
-        .map_err(|err| io::Error::other(err))?;
+        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
     }
 
     Ok(())

src/uucore/src/lib/features/fs.rs

@@ -823,7 +823,7 @@ fn disk_usage_directory<P: AsRef<Path>>(p: P) -> IOResult<u64> {
     for entry in fs::read_dir(p)? {
         let entry = entry?;
         if entry.file_type()?.is_dir() {
-            total += disk_usage_directory(&entry.path())?;
+            total += disk_usage_directory(entry.path())?;
         } else {
             total += entry.metadata()?.len();
         }
@@ -1091,20 +1091,23 @@ mod tests {
     #[test]
     fn calculates_total_size_of_single_file() {
         let dir = tempdir().unwrap();
-        let file_path1 = dir.path().join("file1.txt");    
+        let file_path1 = dir.path().join("file1.txt");
 
         let mut file1 = fs::File::create(&file_path1).unwrap();
         writeln!(file1, "Hello, world!").unwrap();
 
         let paths = vec![file_path1];
 
-        let actual_len = file1.metadata().expect("couldn't get metadata for file1").len();
-
+        let actual_len = file1
+            .metadata()
+            .expect("couldn't get metadata for file1")
+            .len();
+
         let total_size = disk_usage(&paths, false).unwrap();
-        
+
         assert_eq!(total_size, actual_len);
     }
-     #[test]
+    #[test]
     fn calculates_total_size_of_files() {
         let dir = tempdir().unwrap();
         let file_path1 = dir.path().join("file1.txt");
@@ -1118,15 +1121,21 @@ mod tests {
 
         let paths = vec![file_path1, file_path2];
 
-        let file_1_len = file1.metadata().expect("couldn't get metadata for file1").len();
-        let file_2_len = file2.metadata().expect("couldn't get metadata for file1").len();
-        let actual_len = file_1_len+file_2_len;
-
+        let file_1_len = file1
+            .metadata()
+            .expect("couldn't get metadata for file1")
+            .len();
+        let file_2_len = file2
+            .metadata()
+            .expect("couldn't get metadata for file1")
+            .len();
+        let actual_len = file_1_len + file_2_len;
+
         let total_size = disk_usage(&paths, false).unwrap();
-        
-        assert_eq!(total_size, actual_len); 
+
+        assert_eq!(total_size, actual_len);
     }
-     #[test]
+    #[test]
     fn test_disk_usage_recursive() {
         let dir = tempdir().unwrap();
         let file_path = dir.path().join("file1.txt");
@@ -1142,6 +1151,9 @@ mod tests {
         let paths: Vec<PathBuf> = vec![dir.path().to_path_buf()];
         let total_size = disk_usage(&paths, true).unwrap();
 
-        assert_eq!(total_size, file_path.metadata().unwrap().len() + subfile_path.metadata().unwrap().len());
+        assert_eq!(
+            total_size,
+            file_path.metadata().unwrap().len() + subfile_path.metadata().unwrap().len()
+        );
     }
 }

tests/by-util/test_mv.rs

@@ -1926,7 +1926,7 @@ mod inter_partition_copying {
         let at = &scene.fixtures;
         at.mkdir_all("dir");
         let file = at.make_file("dir/file");
-        at.set_mode("dir/file", 0o100700);
+        at.set_mode("dir/file", 0o100_700);
 
         // Set xattrs for the source file
         let test_attr = "user.test_attr";
@@ -1965,7 +1965,7 @@ mod inter_partition_copying {
             .metadata()
             .expect("couldn't get metadata of dest file");
         let mode = dest_metadata.mode();
-        assert_eq!(mode, 0o100700, "permission doesn't match");
+        assert_eq!(mode, 0o100_700, "permission doesn't match");
         assert_eq!(
             dest_metadata
                 .modified()
@@ -1980,7 +1980,7 @@ mod inter_partition_copying {
         );
 
         // Verify that the xattrs were copied
-        let retrieved_xattrs = retrieve_xattrs(&other_fs_tempdir.path().join("dir/file")).unwrap();
+        let retrieved_xattrs = retrieve_xattrs(other_fs_tempdir.path().join("dir/file")).unwrap();
         assert!(retrieved_xattrs.contains_key(OsString::from(test_attr).as_os_str()));
         assert_eq!(
             retrieved_xattrs
@@ -2053,7 +2053,7 @@ mod inter_partition_copying {
         );
 
         // Verify that the xattrs were copied
-        let retrieved_xattrs = retrieve_xattrs(&other_fs_tempdir.path().join("dir")).unwrap();
+        let retrieved_xattrs = retrieve_xattrs(other_fs_tempdir.path().join("dir")).unwrap();
         assert!(retrieved_xattrs.contains_key(OsString::from(test_attr).as_os_str()));
         assert_eq!(
             retrieved_xattrs
@@ -2086,7 +2086,7 @@ mod inter_partition_copying {
             //make sure mv doesn't print errors for the parent directories
             .stderr_does_not_contain("'a/aa'");
         assert!(at.file_exists("a/aa/aa1"));
-        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists())
+        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists());
     }
 
     #[test]
@@ -2116,7 +2116,7 @@ mod inter_partition_copying {
         assert!(at.file_exists("a/aa/aa1"));
         assert!(at.file_exists("a/aa/aa2"));
         assert!(at.dir_exists("a/aa/aaa"));
-        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists())
+        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists());
     }
 
     #[test]
@@ -2142,7 +2142,7 @@ mod inter_partition_copying {
         assert!(at.file_exists("a/aa/aa1"));
         // file that doesn't belong to the branch that error occured didn't got removed
         assert!(!at.file_exists("a/a1"));
-        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists())
+        assert!(other_fs_tempdir.path().join("a/aa/aa1").exists());
     }
 
     #[test]
@@ -2153,7 +2153,7 @@ mod inter_partition_copying {
         at.mkdir_all("a/ab/");
         at.write("a/aa/aa1", "filecontents");
         at.write("a/ab/ab1", "filecontents");
-        
+
         //remove write permssion for the subdir
         at.set_mode("a/aa/", 0o555);
         // create a folder in another partition.
@@ -2170,7 +2170,7 @@ mod inter_partition_copying {
         assert!(at.file_exists("a/aa/aa1"));
         // folder that doesn't belong to the branch that error occured didn't got removed
         assert!(!at.dir_exists("a/ab"));
-        assert!(other_fs_tempdir.path().join("a/ab/ab1").exists())
+        assert!(other_fs_tempdir.path().join("a/ab/ab1").exists());
     }
 }