Handle symlinks in a rather brutal way.

Sebastian Thiel · Sebastian Thiel · commit 209eecf04276 · 2019-06-15T17:43:29.000+08:00
diff --git a/src/interactive/app/handlers.rs b/src/interactive/app/handlers.rs
@@ -274,6 +274,8 @@ fn delete_directory_recursively(path: PathBuf) -> Result<(), usize> {
                 }
             }
             Err(ref e) if e.kind() == io::ErrorKind::NotFound => {
+                // it could also be a broken symlink
+                num_errors += into_error_count(fs::remove_file(path));
                 continue;
             }
             Err(ref e) if e.kind() == io::ErrorKind::Other => {
@@ -289,7 +291,7 @@ fn delete_directory_recursively(path: PathBuf) -> Result<(), usize> {
     }
 
     for dir in dirs.into_iter().rev() {
-        num_errors += into_error_count(fs::remove_dir(dir));
+        num_errors += into_error_count(fs::remove_dir(&dir).or_else(|_| fs::remove_file(dir)));
     }
 
     if num_errors == 0 {

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,8 @@ fn delete_directory_recursively(path: PathBuf) -> Result<(), usize> {`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`Err(ref e) if e.kind() == io::ErrorKind::NotFound => {`
	`277`	`+ // it could also be a broken symlink`
	`278`	`+ num_errors += into_error_count(fs::remove_file(path));`
`277`	`279`	`continue;`
`278`	`280`	`}`
`279`	`281`	`Err(ref e) if e.kind() == io::ErrorKind::Other => {`
`@@ -289,7 +291,7 @@ fn delete_directory_recursively(path: PathBuf) -> Result<(), usize> {`
`289`	`291`	`}`
`290`	`292`
`291`	`293`	`for dir in dirs.into_iter().rev() {`
`292`		`- num_errors += into_error_count(fs::remove_dir(dir));`
	`294`	`+ num_errors += into_error_count(fs::remove_dir(&dir).or_else(\|_\| fs::remove_file(dir)));`
`293`	`295`	`}`
`294`	`296`
`295`	`297`	`if num_errors == 0 {`