refactor(cli): rewrite rustup show with clap_derive

Author: rami3l

src/cli/rustup_mode.rs

@@ -6,7 +6,8 @@ use std::str::FromStr;
 use anyhow::{anyhow, Error, Result};
 use clap::{
     builder::{EnumValueParser, PossibleValue, PossibleValuesParser},
-    Arg, ArgAction, ArgGroup, ArgMatches, Command, ValueEnum,
+    Arg, ArgAction, ArgGroup, ArgMatches, Command, FromArgMatches as _, Parser, Subcommand,
+    ValueEnum,
 };
 use clap_complete::Shell;
 use itertools::Itertools;
@@ -86,6 +87,63 @@ where
     callee(cfg, matches)
 }
 
+#[derive(Debug, Parser)]
+#[command(
+    name = "rustup",
+    bin_name = "rustup[EXE]",
+    version = common::version(),
+)]
+struct Rustup {
+    #[command(subcommand)]
+    subcmd: RustupSubcmd,
+}
+
+#[derive(Debug, Subcommand)]
+enum RustupSubcmd {
+    /// Show the active and installed toolchains or profiles
+    #[command(after_help = SHOW_HELP)]
+    Show {
+        /// Enable verbose output with rustc information for all installed toolchains
+        #[arg(short, long)]
+        verbose: bool,
+
+        #[command(subcommand)]
+        subcmd: Option<ShowSubcmd>,
+    },
+}
+
+#[derive(Debug, Subcommand)]
+enum ShowSubcmd {
+    /// Show the active toolchain
+    #[command(after_help = SHOW_ACTIVE_TOOLCHAIN_HELP)]
+    ActiveToolchain {
+        /// Enable verbose output with rustc information
+        #[arg(short, long)]
+        verbose: bool,
+    },
+
+    /// Display the computed value of RUSTUP_HOME
+    Home,
+
+    /// Show the default profile used for the `rustup install` command
+    Profile,
+}
+
+impl Rustup {
+    fn dispatch(self, cfg: &mut Cfg) -> Result<utils::ExitCode> {
+        match self.subcmd {
+            RustupSubcmd::Show { verbose, subcmd } => match subcmd {
+                None => handle_epipe(show(cfg, verbose)),
+                Some(ShowSubcmd::ActiveToolchain { verbose }) => {
+                    handle_epipe(show_active_toolchain(cfg, verbose))
+                }
+                Some(ShowSubcmd::Home) => handle_epipe(show_rustup_home(cfg)),
+                Some(ShowSubcmd::Profile) => handle_epipe(show_profile(cfg)),
+            },
+        }
+    }
+}
+
 #[cfg_attr(feature = "otel", tracing::instrument(fields(args = format!("{:?}", process().args_os().collect::<Vec<_>>()))))]
 pub fn main() -> Result<utils::ExitCode> {
     self_update::cleanup_self_updater()?;
@@ -158,15 +216,7 @@ pub fn main() -> Result<utils::ExitCode> {
     Ok(match matches.subcommand() {
         Some(s) => match s {
             ("dump-testament", _) => common::dump_testament()?,
-            ("show", c) => match c.subcommand() {
-                Some(s) => match s {
-                    ("active-toolchain", m) => handle_epipe(show_active_toolchain(cfg, m))?,
-                    ("home", _) => handle_epipe(show_rustup_home(cfg))?,
-                    ("profile", _) => handle_epipe(show_profile(cfg))?,
-                    _ => handle_epipe(show(cfg, c))?,
-                },
-                None => handle_epipe(show(cfg, c))?,
-            },
+            ("show", _) => Rustup::from_arg_matches(&matches)?.dispatch(cfg)?,
             ("install", m) => deprecated("toolchain install", cfg, m, update)?,
             ("update", m) => update(cfg, m)?,
             ("check", _) => check_updates(cfg)?,
@@ -287,106 +337,6 @@ pub(crate) fn cli() -> Command {
                 .about("Dump information about the build")
                 .hide(true), // Not for users, only CI
         )
-        .subcommand(
-            Command::new("show")
-                .about("Show the active and installed toolchains or profiles")
-                .after_help(SHOW_HELP)
-                .arg(
-                    verbose_arg("Enable verbose output with rustc information for all installed toolchains"),
-                )
-                .subcommand(
-                    Command::new("active-toolchain")
-                        .about("Show the active toolchain")
-                        .after_help(SHOW_ACTIVE_TOOLCHAIN_HELP)
-                        .arg(
-                            verbose_arg("Enable verbose output with rustc information"),
-                        ),
-                )
-                .subcommand(
-                    Command::new("home")
-                        .about("Display the computed value of RUSTUP_HOME"),
-                )
-                .subcommand(Command::new("profile").about("Show the default profile used for the `rustup install` command"))
-        )
-        .subcommand(
-            Command::new("install")
-                .about("Update Rust toolchains")
-                .after_help(INSTALL_HELP)
-                .hide(true) // synonym for 'toolchain install'
-                .arg(
-                    Arg::new("toolchain")
-                        .help(OFFICIAL_TOOLCHAIN_ARG_HELP)
-                        .required(true)
-                        .value_parser(partial_toolchain_desc_parser)
-                        .num_args(1..)
-                )
-                .arg(
-                    Arg::new("profile")
-                        .long("profile")
-                        .value_parser(PossibleValuesParser::new(Profile::names()))
-                        .num_args(1),
-                )
-                .arg(
-                    Arg::new("no-self-update")
-                        .help("Don't perform self-update when running the `rustup install` command")
-                        .long("no-self-update")
-                        .action(ArgAction::SetTrue)
-                )
-                .arg(
-                    Arg::new("force")
-                        .help("Force an update, even if some components are missing")
-                        .long("force")
-                        .action(ArgAction::SetTrue)
-                ).arg(
-                    Arg::new("force-non-host")
-                        .help("Install toolchains that require an emulator. See https://github.com/rust-lang/rustup/wiki/Non-host-toolchains")
-                        .long("force-non-host")
-                        .action(ArgAction::SetTrue)
-                ),
-        )
-        .subcommand(
-            Command::new("uninstall")
-                .about("Uninstall Rust toolchains")
-                .hide(true) // synonym for 'toolchain uninstall'
-                .arg(
-                    Arg::new("toolchain")
-                        .help(RESOLVABLE_TOOLCHAIN_ARG_HELP)
-                        .required(true)
-                        .value_parser(resolvable_toolchainame_parser)
-                        .num_args(1..)
-                ),
-        )
-        .subcommand(
-            Command::new("update")
-                .about("Update Rust toolchains and rustup")
-                .aliases(["upgrade", "up"])
-                .after_help(UPDATE_HELP)
-                .arg(
-                    Arg::new("toolchain")
-                        .help(OFFICIAL_TOOLCHAIN_ARG_HELP)
-                        .required(false)
-                        .value_parser(partial_toolchain_desc_parser)
-                        .num_args(1..)
-                )
-                .arg(
-                    Arg::new("no-self-update")
-                        .help("Don't perform self update when running the `rustup update` command")
-                        .long("no-self-update")
-                        .action(ArgAction::SetTrue)
-                )
-                .arg(
-                    Arg::new("force")
-                        .help("Force an update, even if some components are missing")
-                        .long("force")
-                        .action(ArgAction::SetTrue)
-                )
-                .arg(
-                    Arg::new("force-non-host")
-                        .help("Install toolchains that require an emulator. See https://github.com/rust-lang/rustup/wiki/Non-host-toolchains")
-                        .long("force-non-host")
-                        .action(ArgAction::SetTrue)
-                ),
-        )
         .subcommand(Command::new("check").about("Check for updates to Rust toolchains and rustup"))
         .subcommand(
             Command::new("default")
@@ -804,20 +754,21 @@ pub(crate) fn cli() -> Command {
                                 .default_value(SelfUpdateMode::default_mode()),
                         ),
                 ),
+        )
+        .subcommand(
+            Command::new("completions")
+                .about("Generate tab-completion scripts for your shell")
+                .after_help(COMPLETIONS_HELP)
+                .arg_required_else_help(true)
+                .arg(Arg::new("shell").value_parser(EnumValueParser::<Shell>::new()))
+                .arg(
+                    Arg::new("command")
+                        .value_parser(EnumValueParser::<CompletionCommand>::new())
+                        .default_missing_value("rustup"),
+                ),
         );
 
-    app.subcommand(
-        Command::new("completions")
-            .about("Generate tab-completion scripts for your shell")
-            .after_help(COMPLETIONS_HELP)
-            .arg_required_else_help(true)
-            .arg(Arg::new("shell").value_parser(EnumValueParser::<Shell>::new()))
-            .arg(
-                Arg::new("command")
-                    .value_parser(EnumValueParser::<CompletionCommand>::new())
-                    .default_missing_value("rustup"),
-            ),
-    )
+    RustupSubcmd::augment_subcommands(app)
 }
 
 fn verbose_arg(help: &'static str) -> Arg {
@@ -1061,11 +1012,9 @@ fn which(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
 }
 
 #[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
-fn show(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
+fn show(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     common::warn_if_host_is_emulated();
 
-    let verbose = m.get_flag("verbose");
-
     // Print host triple
     {
         let mut t = process().stdout().terminal();
@@ -1201,8 +1150,7 @@ fn show(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
 }
 
 #[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
-fn show_active_toolchain(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
-    let verbose = m.get_flag("verbose");
+fn show_active_toolchain(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     let cwd = utils::current_dir()?;
     match cfg.find_active_toolchain(&cwd)? {
         Some((toolchain_name, reason)) => {