fix(clean): Clean hosts builds with new layout

src/cargo/ops/cargo_clean.rs

@@ -200,6 +200,54 @@ fn clean_specs(
         let pkg_dir = format!("{}-*", pkg.name());
         clean_ctx.progress.on_cleaning_package(&pkg.name())?;
 
+        if clean_ctx.gctx.cli_unstable().build_dir_new_layout {
+            for (_compile_kind, layout) in &layouts_with_host {
+                let dir = layout.build_dir().build_unit(&pkg.name());
+                clean_ctx.rm_rf(&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;
+        }
+
         // Clean fingerprints.
         for (_, layout) in &layouts_with_host {
             let dir = escape_glob_path(layout.build_dir().legacy_fingerprint())?;
@@ -228,12 +276,6 @@ fn clean_specs(
                 CompileMode::Check { test: false },
             ] {
                 for (compile_kind, layout) in &layouts {
-                    if clean_ctx.gctx.cli_unstable().build_dir_new_layout {
-                        let dir = layout.build_dir().build_unit(&pkg.name());
-                        clean_ctx.rm_rf_glob(&dir)?;
-                        continue;
-                    }
-
                     let triple = target_data.short_name(compile_kind);
                     let (file_types, _unsupported) = target_data
                         .info(*compile_kind)