feat(cli): add --quiet to rustup (target|component) list

rust-lang · Jun 5, 2024 · 181c673 · 181c673
1 parent d87ee9a
commit 181c673
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -377,13 +377,14 @@ pub(super) fn list_items(
     distributable: DistributableToolchain<'_>,
     f: impl Fn(&ComponentStatus) -> Option<&str>,
     installed_only: bool,
+    quiet: bool,
 ) -> Result<utils::ExitCode> {
     let mut t = process().stdout().terminal();
     for component in distributable.components()? {
         let Some(name) = f(&component) else { continue };
         match (component.available, component.installed, installed_only) {
             (false, _, _) | (_, false, true) => continue,
-            (true, true, false) => {
+            (true, true, false) if !quiet => {
                 t.attr(terminalsource::Attr::Bold)?;
                 writeln!(t.lock(), "{name} (installed)")?;
                 t.reset()?;

diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -385,6 +385,10 @@ enum TargetSubcmd {
         /// List only installed targets
         #[arg(long)]
         installed: bool,
+
+        /// Force the output to be a single column
+        #[arg(long, short)]
+        quiet: bool,
     },
 
     /// Add a target to a Rust toolchain
@@ -421,6 +425,10 @@ enum ComponentSubcmd {
         /// List only installed components
         #[arg(long)]
         installed: bool,
+
+        /// Force the output to be a single column
+        #[arg(long, short)]
+        quiet: bool,
     },
 
     /// Add a component to a Rust toolchain
@@ -641,7 +649,8 @@ pub async fn main() -> Result<utils::ExitCode> {
             TargetSubcmd::List {
                 toolchain,
                 installed,
-            } => handle_epipe(target_list(cfg, toolchain, installed).await),
+                quiet,
+            } => handle_epipe(target_list(cfg, toolchain, installed, quiet).await),
             TargetSubcmd::Add { target, toolchain } => target_add(cfg, target, toolchain).await,
             TargetSubcmd::Remove { target, toolchain } => {
                 target_remove(cfg, target, toolchain).await
@@ -651,7 +660,8 @@ pub async fn main() -> Result<utils::ExitCode> {
             ComponentSubcmd::List {
                 toolchain,
                 installed,
-            } => handle_epipe(component_list(cfg, toolchain, installed).await),
+                quiet,
+            } => handle_epipe(component_list(cfg, toolchain, installed, quiet).await),
             ComponentSubcmd::Add {
                 component,
                 toolchain,
@@ -1097,6 +1107,7 @@ async fn target_list(
     cfg: &Cfg,
     toolchain: Option<PartialToolchainDesc>,
     installed_only: bool,
+    quiet: bool,
 ) -> Result<utils::ExitCode> {
     // downcasting required because the toolchain files can name any toolchain
     let distributable = DistributableToolchain::from_partial(toolchain, cfg).await?;
@@ -1111,6 +1122,7 @@ async fn target_list(
             })
         },
         installed_only,
+        quiet,
     )
 }
 
@@ -1201,10 +1213,11 @@ async fn component_list(
     cfg: &Cfg,
     toolchain: Option<PartialToolchainDesc>,
     installed_only: bool,
+    quiet: bool,
 ) -> Result<utils::ExitCode> {
     // downcasting required because the toolchain files can name any toolchain
     let distributable = DistributableToolchain::from_partial(toolchain, cfg).await?;
-    common::list_items(distributable, |c| Some(&c.name), installed_only)?;
+    common::list_items(distributable, |c| Some(&c.name), installed_only, quiet)?;
     Ok(utils::ExitCode(0))
 }
 

diff --git a/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml
@@ -10,6 +10,7 @@ Options:
       --toolchain <TOOLCHAIN>  Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                information see `rustup help toolchain`
       --installed              List only installed components
+  -q, --quiet                  Force the output to be a single column
   -h, --help                   Print help
 """
 stderr = ""
diff --git a/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml
@@ -10,6 +10,7 @@ Options:
       --toolchain <TOOLCHAIN>  Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                information see `rustup help toolchain`
       --installed              List only installed targets
+  -q, --quiet                  Force the output to be a single column
   -h, --help                   Print help
 """
 stderr = ""