Merge pull request #2433 from ijackson/keep-dir-toplevel

rbtcollins · web-flow · commit a1d59124df97 · 2021-05-19T06:38:30.000+12:00
Do not completely remove ~/.rustup/tmp and download
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ pgp = {version = "0.7", default-features = false}
 pulldown-cmark = {version = "0.8", default-features = false}
 rand = "0.8"
 regex = "1"
-remove_dir_all = "0.6.0"
+remove_dir_all = "0.7.0"
 same-file = "1"
 scopeguard = "1"
 semver = "0.11"
diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -637,7 +637,7 @@ where
 }
 
 pub fn delete_dir_contents(dir_path: &Path) {
-    match remove_dir_all::remove_dir_all(dir_path) {
+    match remove_dir_all::remove_dir_contents(dir_path) {
         Err(e) if e.kind() != io::ErrorKind::NotFound => {
             panic!("Unable to clean up {}: {:?}", dir_path.display(), e);
         }

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ where`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`pub fn delete_dir_contents(dir_path: &Path) {`
`640`		`- match remove_dir_all::remove_dir_all(dir_path) {`
	`640`	`+ match remove_dir_all::remove_dir_contents(dir_path) {`
`641`	`641`	`Err(e) if e.kind() != io::ErrorKind::NotFound => {`
`642`	`642`	`panic!("Unable to clean up {}: {:?}", dir_path.display(), e);`
`643`	`643`	`}`