clean: Add --workspace support

Co-authored-by: Dino <dino@zed.dev>

Author: osiewicz

src/bin/cargo/commands/clean.rs

@@ -7,6 +7,7 @@ use cargo::ops::CleanContext;
 use cargo::ops::{self, CleanOptions};
 use cargo::util::print_available_packages;
 use clap_complete::ArgValueCandidates;
+use indexmap::IndexSet;
 use std::time::Duration;
 
 pub fn cli() -> Command {
@@ -18,6 +19,10 @@ pub fn cli() -> Command {
             "Package to clean artifacts for",
             ArgValueCandidates::new(get_pkg_name_candidates),
         )
+        .arg(
+            flag("workspace", "Only clean the workspace packages")
+                .help_heading(heading::PACKAGE_SELECTION),
+        )
         .arg_release("Whether or not to clean release artifacts")
         .arg_profile("Clean artifacts of the specified profile")
         .arg_target_triple("Target triple to clean output for")
@@ -146,10 +151,14 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
     if args.is_present_with_zero_values("package") {
         print_available_packages(&ws)?;
     }
+    let mut spec = IndexSet::from_iter(values(args, "package"));
 
+    if args.flag("workspace") {
+        spec.extend(ws.members().map(|package| package.name().to_string()))
+    };
     let opts = CleanOptions {
         gctx,
-        spec: values(args, "package"),
+        spec,
         targets: args.targets()?,
         requested_profile: args.get_profile_name("dev", ProfileChecking::Custom)?,
         profile_specified: args.contains_id("profile") || args.flag("release"),

src/cargo/ops/cargo_clean.rs

@@ -9,6 +9,7 @@ use crate::util::interning::InternedString;
 use crate::util::{GlobalContext, Progress, ProgressStyle};
 use anyhow::bail;
 use cargo_util::paths;
+use indexmap::IndexSet;
 use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -17,7 +18,7 @@ use std::rc::Rc;
 pub struct CleanOptions<'gctx> {
     pub gctx: &'gctx GlobalContext,
     /// A list of packages to clean. If empty, everything is cleaned.
-    pub spec: Vec<String>,
+    pub spec: IndexSet<String>,
     /// The target arch triple to clean, or None for the host arch
     pub targets: Vec<String>,
     /// Whether to clean the release directory
@@ -108,7 +109,7 @@ fn clean_specs(
     ws: &Workspace<'_>,
     profiles: &Profiles,
     targets: &[String],
-    spec: &[String],
+    spec: &IndexSet<String>,
     dry_run: bool,
 ) -> CargoResult<()> {
     // Clean specific packages.

tests/testsuite/cargo_clean/help/stdout.term.svg

@@ -233,7 +233,7 @@ fn clean_workspace_does_not_touch_non_workspace_packages() {
 
     let fingerprint_path = &p.build_dir().join("debug").join(".fingerprint");
 
-    p.cargo("build -p foo -p foo_core -p foo-base").run();
+    p.cargo("check -p foo -p foo_core -p foo-base").run();
 
     let mut fingerprint_names = get_fingerprints_without_hashes(fingerprint_path);