Fix Windows build

rust-lang · Jul 4, 2019 · 85958b0 · 85958b0
1 parent f4f2487
commit 85958b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ tar = "0.4.13"
 walkdir = "2"
 xz2 = "0.1.4"
 num_cpus = "1"
+remove_dir_all = "0.5"
 
 [dependencies.clap]
 features = ["yaml"]

diff --git a/src/lib.rs b/src/lib.rs
@@ -3,9 +3,6 @@ pub type Result<T> = std::result::Result<T, failure::Error>;
 #[macro_use]
 mod util;
 
-// deal with OS complications (cribbed from rustup.rs)
-mod remove_dir_all;
-
 mod combiner;
 mod generator;
 mod scripter;

diff --git a/src/util.rs b/src/util.rs
@@ -83,7 +83,7 @@ pub fn open_file<P: AsRef<Path>>(path: P) -> Result<fs::File> {
 
 /// Wraps `remove_dir_all` with a nicer error message.
 pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> Result<()> {
-    crate::remove_dir_all::remove_dir_all(path.as_ref())
+    remove_dir_all::remove_dir_all(path.as_ref())
         .with_context(|_| format!("failed to remove dir '{}'", path.as_ref().display()))?;
     Ok(())
 }