fixup! refactor(cli): rewrite rustup (man|completions) with clap-derive

Author: rami3l

src/cli/rustup_mode.rs

@@ -221,7 +221,7 @@ enum RustupSubcmd {
     Completions {
         shell: Shell,
 
-        #[arg(default_missing_value = "rustup")]
+        #[arg(default_value = "rustup")]
         command: CompletionCommand,
     },
 }
@@ -521,6 +521,7 @@ impl Rustup {
                 topic,
                 page,
             } => doc(cfg, path, toolchain, topic.as_deref(), &page),
+            #[cfg(not(windows))]
             RustupSubcmd::Man { command, toolchain } => man(cfg, &command, toolchain),
             RustupSubcmd::Completions { shell, command } => {
                 output_completion_script(shell, command)

tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml

@@ -1,14 +1,14 @@
 bin.name = "rustup"
-args = ["completions","--help"]
+args = ["completions", "--help"]
 stdout = """
 ...
 Generate tab-completion scripts for your shell
 
-Usage: rustup[EXE] completions [shell] [command]
+Usage: rustup[EXE] completions <SHELL> <COMMAND>
 
 Arguments:
-  [shell]    [possible values: bash, elvish, fish, powershell, zsh]
-  [command]  [possible values: rustup, cargo]
+  <SHELL>    [possible values: bash, elvish, fish, powershell, zsh]
+  <COMMAND>  [default: rustup] [possible values: rustup, cargo]
 
 Options:
   -h, --help  Print help

tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml

@@ -9,10 +9,8 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-...
   self         Modify the rustup installation
   set          Alter rustup settings
-  completions  Generate tab-completion scripts for your shell
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
@@ -24,6 +22,8 @@ Commands:
   run          Run a command with an environment configured for a given toolchain
   which        Display which binary will be run for a given command
   doc          Open the documentation for the current toolchain
+...
+  completions  Generate tab-completion scripts for your shell
   help         Print this message or the help of the given subcommand(s)
 
 Arguments:

tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml

@@ -9,10 +9,8 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-...
   self         Modify the rustup installation
   set          Alter rustup settings
-  completions  Generate tab-completion scripts for your shell
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
@@ -24,6 +22,8 @@ Commands:
   run          Run a command with an environment configured for a given toolchain
   which        Display which binary will be run for a given command
   doc          Open the documentation for the current toolchain
+...
+  completions  Generate tab-completion scripts for your shell
   help         Print this message or the help of the given subcommand(s)
 
 Arguments:

tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml

@@ -1,16 +1,16 @@
 bin.name = "rustup"
-args = ["man","--help"]
+args = ["man", "--help"]
 stdout = """
 ...
 View the man page for a given command
 
-Usage: rustup[EXE] man [OPTIONS] <command>
+Usage: rustup[EXE] man [OPTIONS] <COMMAND>
 
 Arguments:
-  <command>  
+  <COMMAND>  
 
 Options:
-      --toolchain <toolchain>  Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
+      --toolchain <TOOLCHAIN>  Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more
                                information see `rustup help toolchain`
   -h, --help                   Print help
 """

tests/suite/cli-ui/rustup/rustup_only_options_stdout.toml

@@ -9,10 +9,8 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-...
   self         Modify the rustup installation
   set          Alter rustup settings
-  completions  Generate tab-completion scripts for your shell
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
@@ -24,6 +22,8 @@ Commands:
   run          Run a command with an environment configured for a given toolchain
   which        Display which binary will be run for a given command
   doc          Open the documentation for the current toolchain
+...
+  completions  Generate tab-completion scripts for your shell
   help         Print this message or the help of the given subcommand(s)
 
 Arguments:

tests/suite/cli_misc.rs

@@ -798,11 +798,11 @@ fn completion_bad_shell() {
     setup(&|config| {
         config.expect_err(
             &["rustup", "completions", "fake"],
-            r#"error: invalid value 'fake' for '[shell]'"#,
+            r#"error: invalid value 'fake' for '[SHELL]'"#,
         );
         config.expect_err(
             &["rustup", "completions", "fake", "cargo"],
-            r#"error: invalid value 'fake' for '[shell]'"#,
+            r#"error: invalid value 'fake' for '[SHELL]'"#,
         );
     });
 }
@@ -812,7 +812,7 @@ fn completion_bad_tool() {
     setup(&|config| {
         config.expect_err(
             &["rustup", "completions", "bash", "fake"],
-            r#"error: invalid value 'fake' for '[command]'"#,
+            r#"error: invalid value 'fake' for '[COMMAND]'"#,
         );
     });
 }