Auto merge of #1207 - nindalf:master, r=alexcrichton

Replace remove_dir_all() from rustup-utils with crate remove_dir_all

Fixes task #1204
Apologies if I misunderstood the task.

Author: bors

Cargo.lock

@@ -52,6 +52,7 @@ scopeguard = "0.3"
 sha2 = "0.6.0"
 toml = "0.1"
 wait-timeout = "0.1.5"
+remove_dir_all = "0.2.0"
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"

Cargo.toml

@@ -24,6 +24,7 @@ tempdir = "0.3.4"
 walkdir = "1.0"
 toml = "0.1.27"
 sha2 = "0.6.0"
+remove_dir_all = "0.2"
 rustup-utils = { path = "../rustup-utils" }
 error-chain = "0.10"
 

src/rustup-dist/Cargo.toml

@@ -1,3 +1,5 @@
+extern crate remove_dir_all;
+
 use std::error;
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -237,7 +239,7 @@ impl<'a> ops::Deref for File<'a> {
 impl<'a> Drop for Dir<'a> {
     fn drop(&mut self) {
         if raw::is_directory(&self.path) {
-            let n = Notification::DirectoryDeletion(&self.path, fs::remove_dir_all(&self.path));
+            let n = Notification::DirectoryDeletion(&self.path, remove_dir_all::remove_dir_all(&self.path));
             (self.cfg.notify_handler)(n);
         }
     }

src/rustup-dist/src/temp.rs

@@ -16,6 +16,7 @@ download = { path = "../download" }
 error-chain = "0.10"
 libc = "0.2.0"
 rand = "0.3.11"
+remove_dir_all = "0.2.0"
 rustc-serialize = "0.3.19"
 scopeguard = "0.3.0"
 semver = "0.7.0"

src/rustup-utils/Cargo.toml

@@ -38,7 +38,6 @@ pub mod raw;
 pub mod tty;
 pub mod utils;
 pub mod toml_utils;
-mod remove_dir_all;
 
 pub use errors::*;
 pub use notifications::{Notification};

src/rustup-utils/src/lib.rs

@@ -1,3 +1,5 @@
+extern crate remove_dir_all;
+
 use std::char::from_u32;
 use std::env;
 use std::error;
@@ -309,7 +311,7 @@ pub fn remove_dir(path: &Path) -> io::Result<()> {
         // this is a custom implementation, more-or-less copied from cargo.
         // cc rust-lang/rust#31944
         // cc https://github.com/rust-lang/cargo/blob/master/tests/support/paths.rs#L52
-        ::remove_dir_all::remove_dir_all(path)
+        remove_dir_all::remove_dir_all(path)
     }
 }