fix(clean): Remove uplifted for specified package for new layout

Author: epage

src/cargo/ops/cargo_clean.rs

@@ -205,6 +205,46 @@ fn clean_specs(
                 let dir = layout.build_dir().build_unit(&pkg.name());
                 clean_ctx.rm_rf_glob(&dir)?;
             }
+
+            for target in pkg.targets() {
+                if target.is_custom_build() {
+                    continue;
+                }
+                for &mode in &[
+                    CompileMode::Build,
+                    CompileMode::Test,
+                    CompileMode::Check { test: false },
+                ] {
+                    for (compile_kind, layout) in &layouts {
+                        let triple = target_data.short_name(compile_kind);
+                        let (file_types, _unsupported) = target_data
+                            .info(*compile_kind)
+                            .rustc_outputs(mode, target.kind(), triple, clean_ctx.gctx)?;
+                        let artifact_dir = layout
+                            .artifact_dir()
+                            .expect("artifact-dir was not locked during clean");
+                        let uplift_dir = match target.kind() {
+                            TargetKind::ExampleBin | TargetKind::ExampleLib(..) => {
+                                Some(artifact_dir.examples())
+                            }
+                            // Tests/benchmarks are never uplifted.
+                            TargetKind::Test | TargetKind::Bench => None,
+                            _ => Some(artifact_dir.dest()),
+                        };
+                        // Remove the uplifted copy.
+                        if let Some(uplift_dir) = uplift_dir {
+                            for file_type in file_types {
+                                let uplifted_path =
+                                    uplift_dir.join(file_type.uplift_filename(target));
+                                clean_ctx.rm_rf(&uplifted_path)?;
+                                // Dep-info generated by Cargo itself.
+                                let dep_info = uplifted_path.with_extension("d");
+                                clean_ctx.rm_rf(&dep_info)?;
+                            }
+                        }
+                    }
+                }
+            }
             continue;
         }
 

tests/testsuite/clean_new_layout.rs

@@ -113,8 +113,8 @@ fn clean_multiple_packages() {
         .masquerade_as_nightly_cargo(&["new build-dir layout"])
         .run();
     assert!(p.bin("foo").is_file());
-    assert!(d1_path.is_file()); // FIXME
-    assert!(d2_path.is_file()); // FIXME
+    assert!(!d1_path.is_file());
+    assert!(!d2_path.is_file());
 }
 
 #[cargo_test]
@@ -561,7 +561,7 @@ fn clean_remove_rlib_rmeta() {
         .arg("-Zbuild-dir-new-layout")
         .masquerade_as_nightly_cargo(&["new build-dir layout"])
         .run();
-    assert!(p.target_debug_dir().join("libfoo.rlib").exists()); // FIXME
+    assert!(!p.target_debug_dir().join("libfoo.rlib").exists());
     assert!(!rmeta.exists());
 }