Auto merge of #5059 - tobywhughes:master, r=alexcrichton

Clean with --verbose now prints path of what is being removed.

Added verbose output for the clean command. Simply takes whatever is passed into the rm_rf() function and outputs "Removing /whatever/the/path/to/remove/is"

[Issue this is being used for](#5056)

Author: bors

src/cargo/ops/cargo_clean.rs

@@ -17,6 +17,7 @@ pub struct CleanOptions<'a> {
 /// Cleans the project from build artifacts.
 pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
     let target_dir = ws.target_dir();
+    let config = ws.config();
 
     // If we have a spec, then we need to delete some packages, otherwise, just
     // remove the whole target directory and be done with it!
@@ -25,7 +26,7 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
     // blow it all away anyway.
     if opts.spec.is_empty() {
         let target_dir = target_dir.into_path_unlocked();
-        return rm_rf(&target_dir);
+        return rm_rf(&target_dir, config);
     }
 
     let (packages, resolve) = ops::resolve_ws(ws)?;
@@ -73,37 +74,39 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
     cx.probe_target_info(&units)?;
 
     for unit in units.iter() {
-        rm_rf(&cx.fingerprint_dir(unit))?;
+        rm_rf(&cx.fingerprint_dir(unit), config)?;
         if unit.target.is_custom_build() {
             if unit.profile.run_custom_build {
-                rm_rf(&cx.build_script_out_dir(unit))?;
+                rm_rf(&cx.build_script_out_dir(unit), config)?;
             } else {
-                rm_rf(&cx.build_script_dir(unit))?;
+                rm_rf(&cx.build_script_dir(unit), config)?;
             }
             continue
         }
 
         for &(ref src, ref link_dst, _) in cx.target_filenames(unit)?.iter() {
-            rm_rf(src)?;
+            rm_rf(src, config)?;
             if let Some(ref dst) = *link_dst {
-                rm_rf(dst)?;
+                rm_rf(dst, config)?;
             }
         }
     }
 
     Ok(())
 }
 
-fn rm_rf(path: &Path) -> CargoResult<()> {
+fn rm_rf(path: &Path, config: &Config) -> CargoResult<()> {
     let m = fs::metadata(path);
     if m.as_ref().map(|s| s.is_dir()).unwrap_or(false) {
+        config.shell().verbose(|shell| {shell.status("Removing", path.display())})?;
         fs::remove_dir_all(path).chain_err(|| {
             format_err!("could not remove build directory")
         })?;
     } else if m.is_ok() {
+        config.shell().verbose(|shell| {shell.status("Removing", path.display())})?;
         fs::remove_file(path).chain_err(|| {
             format_err!("failed to remove build artifact")
         })?;
     }
     Ok(())
-}
+}

tests/testsuite/clean.rs

@@ -234,3 +234,30 @@ fn registry() {
     assert_that(p.cargo("build"),
                 execs().with_status(0));
 }
+
+#[test]
+fn clean_verbose(){
+    let p = project("foo")
+    .file("Cargo.toml", r#"
+        [package]
+        name = "foo"
+        version = "0.0.1"
+
+        [dependencies]
+        bar = "0.1"
+    "#)
+    .file("src/main.rs", "fn main() {}")
+    .build();
+
+    Package::new("bar", "0.1.0").publish();
+
+    assert_that(p.cargo("build"),
+                execs().with_status(0));
+    assert_that(p.cargo("clean").arg("-p").arg("bar").arg("--verbose"),
+                execs().with_status(0).with_stderr("\
+[REMOVING] [..]
+[REMOVING] [..]
+"));
+    assert_that(p.cargo("build"),
+            execs().with_status(0));
+}