fixup! refactor(cli): rewrite rustup doc with clap-derive

Author: rami3l

src/cli/rustup_mode.rs

@@ -1477,8 +1477,10 @@ fn override_remove(cfg: &Cfg, path: Option<&Path>, nonexistent: bool) -> Result<
 
 macro_rules! docs_data {
     (
-        $( $( #[$meta:meta] )*
-        ($ident:ident, $help:expr, $path:expr $(,)?)),+ $(,)?
+        $(
+            $( #[$meta:meta] )*
+            ($ident:ident, $help:expr, $path:expr $(,)?)
+        ),+ $(,)?
     ) => {
         #[derive(Debug, Args)]
         struct DocPage {

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

@@ -1,19 +1,19 @@
 bin.name = "rustup"
-args = ["doc","--help"]
+args = ["doc", "--help"]
 stdout = """
 ...
 Open the documentation for the current toolchain
 
-Usage: rustup[EXE] doc [OPTIONS] [topic]
+Usage: rustup[EXE] doc [OPTIONS] [TOPIC]
 
 Arguments:
-  [topic]  Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!',
+  [TOPIC]  Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!',
            'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum',
            'std::io::error::Result' etc...
 
 Options:
       --path                   Only print the path to the documentation
-      --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`
       --alloc                  The Rust core allocation and collections library
       --book                   The Rust Programming Language book

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

@@ -9,7 +9,6 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-  doc          Open the documentation for the current toolchain
 ...
   self         Modify the rustup installation
   set          Alter rustup settings
@@ -24,6 +23,7 @@ Commands:
   override     Modify toolchain overrides for directories
   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
   help         Print this message or the help of the given subcommand(s)
 
 Arguments:

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

@@ -9,7 +9,6 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-  doc          Open the documentation for the current toolchain
 ...
   self         Modify the rustup installation
   set          Alter rustup settings
@@ -24,6 +23,7 @@ Commands:
   override     Modify toolchain overrides for directories
   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
   help         Print this message or the help of the given subcommand(s)
 
 Arguments:

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

@@ -9,7 +9,6 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
-  doc          Open the documentation for the current toolchain
 ...
   self         Modify the rustup installation
   set          Alter rustup settings
@@ -24,6 +23,7 @@ Commands:
   override     Modify toolchain overrides for directories
   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
   help         Print this message or the help of the given subcommand(s)
 
 Arguments: