consistently warn to stderr if a file could not be deleted

Fixes #26
matthiaskrgr · Dec 20, 2018 · 183ee36 · 183ee36
1 parent bcbeabd
commit 183ee36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/library.rs b/src/library.rs
@@ -48,7 +48,6 @@ pub(crate) enum ErrorKind {
     CargoFailedGetConfig,
     CargoHomeNotDirectory,
     InvalidDeletableDir,
-    RemoveFailed,
     RemoveDirNoArg,
 }
 
@@ -238,9 +237,9 @@ pub(crate) fn rm_old_crates(
                     );
                 } else {
                     println!("deleting: {} {} at {}", pkgname, pkgver, pkgpath.display());
-                    fs::remove_file(pkgpath).unwrap_or_else(|_| {
-                        panic!("Failed to remove file '{}'", pkgpath.display())
-                    });
+                    if fs::remove_file(pkgpath).is_err() {
+                        warn_on_undeletable_file(&pkgpath);
+                    }
                     *size_changed = true;
                 }
                 continue;
@@ -265,9 +264,10 @@ pub(crate) fn rm_old_crates(
                         );
                     } else {
                         println!("deleting: {} {} at {}", pkgname, pkgver, pkgpath.display());
-                        fs::remove_file(pkgpath).unwrap_or_else(|_| {
-                            panic!("Failed to remove file '{}'", pkgpath.display())
-                        });
+                        if fs::remove_file(pkgpath).is_err() {
+                            warn_on_undeletable_file(&pkgpath);
+                        }
+
                         *size_changed = true;
                     }
                 }
@@ -415,10 +415,7 @@ pub(crate) fn remove_dir_via_cmdline(
         } else {
             println!("removing: '{}'", dir.display());
             if fs::remove_dir_all(&dir).is_err() {
-                return Err((
-                    ErrorKind::RemoveFailed,
-                    format!("failed to remove directory {}", dir.display()),
-                ));
+                warn_on_undeletable_file(&dir);
             }
             *size_changed = true;
         }
@@ -516,6 +513,10 @@ pub(crate) fn remove_dir_via_cmdline(
     Ok(())
 }
 
+pub(crate) fn warn_on_undeletable_file(path: &PathBuf) {
+    eprintln!("Warning: failed to remove \"{}\".", path.display());
+}
+
 #[cfg(test)]
 mod libtests {
     use super::*;

diff --git a/src/main.rs b/src/main.rs
@@ -132,8 +132,9 @@ fn main() {
                 if config.is_present("dry-run") {
                     println!("would remove directory '{}'", dir.display());
                 } else {
-                    fs::remove_dir_all(&dir)
-                        .unwrap_or_else(|_| panic!("Failed to remove file '{}'", dir.display()));
+                    if fs::remove_dir_all(&dir).is_err() {
+                        warn_on_undeletable_file(&dir);
+                    }
                     size_changed = true;
                 }
             }