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", "Clean artifacts of the workspace members")
+                .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.

src/doc/man/cargo-clean.md

@@ -26,10 +26,16 @@ When no packages are selected, all packages and all dependencies in the
 workspace are cleaned.
 
 {{#options}}
+
 {{#option "`-p` _spec_..." "`--package` _spec_..." }}
 Clean only the specified packages. This flag may be specified
 multiple times. See {{man "cargo-pkgid" 1}} for the SPEC format.
 {{/option}}
+
+{{#option "`--workspace`" }}
+Clean artifacts of the workspace members. 
+{{/option}}
+
 {{/options}}
 
 ### Clean Options

src/doc/man/generated_txt/cargo-clean.txt

@@ -21,6 +21,9 @@ OPTIONS
            Clean only the specified packages. This flag may be specified
            multiple times. See cargo-pkgid(1) for the SPEC format.
 
+       --workspace
+           Clean artifacts of the workspace members.
+
    Clean Options
        --dry-run
            Displays a summary of what would be deleted without deleting

src/doc/src/commands/cargo-clean.md

@@ -22,12 +22,19 @@ When no packages are selected, all packages and all dependencies in the
 workspace are cleaned.
 
 <dl>
+
 <dt class="option-term" id="option-cargo-clean--p"><a class="option-anchor" href="#option-cargo-clean--p"><code>-p</code> <em>spec</em>…</a></dt>
 <dt class="option-term" id="option-cargo-clean---package"><a class="option-anchor" href="#option-cargo-clean---package"><code>--package</code> <em>spec</em>…</a></dt>
 <dd class="option-desc"><p>Clean only the specified packages. This flag may be specified
 multiple times. See <a href="cargo-pkgid.html">cargo-pkgid(1)</a> for the SPEC format.</p>
 </dd>
 
+
+<dt class="option-term" id="option-cargo-clean---workspace"><a class="option-anchor" href="#option-cargo-clean---workspace"><code>--workspace</code></a></dt>
+<dd class="option-desc"><p>Clean artifacts of the workspace members.</p>
+</dd>
+
+
 </dl>
 
 ### Clean Options

src/etc/man/cargo-clean.1

@@ -23,6 +23,11 @@ workspace are cleaned.
 Clean only the specified packages. This flag may be specified
 multiple times. See \fBcargo\-pkgid\fR(1) for the SPEC format.
 .RE
+.sp
+\fB\-\-workspace\fR
+.RS 4
+Clean artifacts of the workspace members.
+.RE
 .SS "Clean Options"
 .sp
 \fB\-\-dry\-run\fR

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

@@ -248,7 +248,7 @@ fn clean_workspace_does_not_touch_non_workspace_packages() {
         .count();
     assert_ne!(num_external_dependency_artifacts, 0);
 
-    p.cargo("clean -p foo -p foo_core -p foo-base").run();
+    p.cargo("clean --workspace").run();
 
     fingerprint_names = get_fingerprints_without_hashes(fingerprint_path);
 
@@ -318,8 +318,7 @@ fn clean_workspace_with_extra_package_specifiers() {
         .count();
     assert_ne!(num_external_dependency_2_artifacts, 0);
 
-    p.cargo("clean -p foo -p foo_core -p foo-base -p external_dependency_1")
-        .run();
+    p.cargo("clean --workspace -p external_dependency_1").run();
 
     fingerprint_names = get_fingerprints_without_hashes(fingerprint_path);