diff --git a/Cargo.toml b/Cargo.toml index d62cc58..37dcbb5 100644 --- 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 index 39a613a..0310aba 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,9 +3,6 @@ pub type Result = std::result::Result; #[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 index 8c1a9ca..868a636 100644 --- a/src/util.rs +++ b/src/util.rs @@ -83,7 +83,7 @@ pub fn open_file>(path: P) -> Result { /// Wraps `remove_dir_all` with a nicer error message. pub fn remove_dir_all>(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(()) }