also improve remove error for files

Author: Skgland

src/build.rs

@@ -147,7 +147,7 @@ impl BuildDirectory {
         let source_dir = self.source_dir();
         if source_dir.exists() {
             remove_dir_all(&source_dir)
-                .map_err(|error| crate::utils::improve_remove_dir_error(error, &source_dir))?;
+                .map_err(|error| crate::utils::improve_remove_error(error, &source_dir))?;
         }
 
         let mut prepare = Prepare::new(&self.workspace, toolchain, krate, &source_dir, patches);
@@ -161,7 +161,7 @@ impl BuildDirectory {
         })?;
 
         remove_dir_all(&source_dir)
-            .map_err(|error| crate::utils::improve_remove_dir_error(error, &source_dir))?;
+            .map_err(|error| crate::utils::improve_remove_error(error, &source_dir))?;
         Ok(res)
     }
 
@@ -170,7 +170,7 @@ impl BuildDirectory {
         let build_dir = self.build_dir();
         if build_dir.exists() {
             remove_dir_all(&build_dir)
-                .map_err(|error| crate::utils::improve_remove_dir_error(error, &build_dir))?;
+                .map_err(|error| crate::utils::improve_remove_error(error, &build_dir))?;
         }
         Ok(())
     }

src/crates/cratesio.rs

@@ -62,7 +62,8 @@ impl CrateTrait for CratesIOCrate {
     fn purge_from_cache(&self, workspace: &Workspace) -> Result<(), Error> {
         let path = self.cache_path(workspace);
         if path.exists() {
-            std::fs::remove_file(&path)?;
+            std::fs::remove_file(&path)
+                .map_err(|error| crate::utils::improve_remove_error(error, &path))?;
         }
         Ok(())
     }

src/crates/git.rs

@@ -122,7 +122,7 @@ impl CrateTrait for GitRepo {
         let path = self.cached_path(workspace);
         if path.exists() {
             remove_dir_all::remove_dir_all(&path)
-                .map_err(|error| crate::utils::improve_remove_dir_error(error, &path))?;
+                .map_err(|error| crate::utils::improve_remove_error(error, &path))?;
         }
         Ok(())
     }

src/crates/local.rs

@@ -145,7 +145,8 @@ mod tests {
         println!("{} should cause copy to fail", bad_link.display());
         assert_copy_err_has_filename();
 
-        fs::remove_file(&bad_link)?;
+        fs::remove_file(&bad_link)
+            .map_err(|error| crate::utils::improve_remove_error(error, &bad_link))?;
         // make sure it works without that link
         super::copy_dir(tmp_src.path(), tmp_dest.path())?;
 

src/crates/mod.rs

@@ -70,7 +70,7 @@ impl Crate {
                 dest.display()
             );
             remove_dir_all(dest)
-                .map_err(|error| crate::utils::improve_remove_dir_error(error, dest))?;
+                .map_err(|error| crate::utils::improve_remove_error(error, dest))?;
         }
         self.as_trait().copy_source_to(workspace, dest)
     }

src/prepare.rs

@@ -73,8 +73,8 @@ impl<'a> Prepare<'a> {
     fn remove_cargo_config(&self) -> Result<(), Error> {
         let path = self.source_dir.join(".cargo").join("config");
         if path.exists() {
-            remove_file(path.clone())?;
-            info!("removed {}", path.as_path().display());
+            remove_file(&path).map_err(|error| crate::utils::improve_remove_error(error, &path))?;
+            info!("removed {}", path.display());
         }
         Ok(())
     }

src/utils.rs

@@ -51,50 +51,50 @@ fn strip_verbatim_from_prefix(prefix: &PrefixComponent<'_>) -> Option<PathBuf> {
 }
 
 #[derive(Debug)]
-struct DirRemoveError {
+struct RemoveError {
     kind: std::io::ErrorKind,
     path: String,
 }
 
-impl std::error::Error for DirRemoveError {}
+impl std::error::Error for RemoveError {}
 
-impl std::fmt::Display for DirRemoveError {
+impl std::fmt::Display for RemoveError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_fmt(format_args!(
-            "failed to remove directory '{}' : {:?}",
+            "failed to remove '{}' : {:?}",
             self.path, self.kind
         ))
     }
 }
 
-pub(crate) fn improve_remove_dir_error(error: std::io::Error, path: &Path) -> std::io::Error {
+pub(crate) fn improve_remove_error(error: std::io::Error, path: &Path) -> std::io::Error {
     std::io::Error::new(
         error.kind(),
-        DirRemoveError {
+        RemoveError {
             kind: error.kind(),
             path: path.display().to_string(),
         },
     )
 }
 
 #[test]
-fn custom_remove_dir_error() {
+fn custom_remove_error() {
     let path = "test/path".as_ref();
 
-    let expected = "failed to remove directory 'test/path' : PermissionDenied";
+    let expected = "failed to remove 'test/path' : PermissionDenied";
     let tested = format!(
         "{}",
-        improve_remove_dir_error(
+        improve_remove_error(
             std::io::Error::from(std::io::ErrorKind::PermissionDenied),
             path
         )
     );
     assert_eq!(expected, tested);
 
-    let expected = "Custom { kind: PermissionDenied, error: DirRemoveError { kind: PermissionDenied, path: \"test/path\" } }";
+    let expected = "Custom { kind: PermissionDenied, error: RemoveError { kind: PermissionDenied, path: \"test/path\" } }";
     let tested = format!(
         "{:?}",
-        improve_remove_dir_error(
+        improve_remove_error(
             std::io::Error::from(std::io::ErrorKind::PermissionDenied),
             path
         )

src/workspace.rs

@@ -214,7 +214,7 @@ impl Workspace {
         let dir = self.builds_dir();
         if dir.exists() {
             remove_dir_all(&dir)
-                .map_err(|error| crate::utils::improve_remove_dir_error(error, &dir))?;
+                .map_err(|error| crate::utils::improve_remove_error(error, &dir))?;
         }
         Ok(())
     }
@@ -238,7 +238,7 @@ impl Workspace {
         for path in &paths {
             if path.exists() {
                 remove_dir_all(&path)
-                    .map_err(|error| crate::utils::improve_remove_dir_error(error, &path))?;
+                    .map_err(|error| crate::utils::improve_remove_error(error, &path))?;
             }
         }