Move toolchain and default commands first

Author: djc

src/cli/rustup_mode.rs

@@ -125,6 +125,23 @@ enum RustupSubcmd {
     #[command(hide = true)]
     DumpTestament,
 
+    /// Modify or query the installed toolchains
+    Toolchain {
+        #[command(subcommand)]
+        subcmd: ToolchainSubcmd,
+    },
+
+    /// Set the default toolchain
+    #[command(after_help = DEFAULT_HELP)]
+    Default {
+        #[arg(help = MAYBE_RESOLVABLE_TOOLCHAIN_ARG_HELP)]
+        toolchain: Option<MaybeResolvableToolchainName>,
+
+        /// Install toolchains that require an emulator. See https://github.com/rust-lang/rustup/wiki/Non-host-toolchains
+        #[arg(long)]
+        force_non_host: bool,
+    },
+
     /// Show the active and installed toolchains or profiles
     #[command(after_help = SHOW_HELP)]
     Show {
@@ -162,23 +179,6 @@ enum RustupSubcmd {
     /// Check for updates to Rust toolchains and rustup
     Check,
 
-    /// Set the default toolchain
-    #[command(after_help = DEFAULT_HELP)]
-    Default {
-        #[arg(help = MAYBE_RESOLVABLE_TOOLCHAIN_ARG_HELP)]
-        toolchain: Option<MaybeResolvableToolchainName>,
-
-        /// Install toolchains that require an emulator. See https://github.com/rust-lang/rustup/wiki/Non-host-toolchains
-        #[arg(long)]
-        force_non_host: bool,
-    },
-
-    /// Modify or query the installed toolchains
-    Toolchain {
-        #[command(subcommand)]
-        subcmd: ToolchainSubcmd,
-    },
-
     /// Modify a toolchain's supported targets
     Target {
         #[command(subcommand)]

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

@@ -9,11 +9,11 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
+  toolchain    Modify or query the installed toolchains
+  default      Set the default toolchain
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
-  default      Set the default toolchain
-  toolchain    Modify or query the installed toolchains
   target       Modify a toolchain's supported targets
   component    Modify a toolchain's installed components
   override     Modify toolchain overrides for directories

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

@@ -9,11 +9,11 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
+  toolchain    Modify or query the installed toolchains
+  default      Set the default toolchain
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
-  default      Set the default toolchain
-  toolchain    Modify or query the installed toolchains
   target       Modify a toolchain's supported targets
   component    Modify a toolchain's installed components
   override     Modify toolchain overrides for directories

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

@@ -9,11 +9,11 @@ The Rust toolchain installer
 Usage: rustup[EXE] [OPTIONS] [+toolchain] [COMMAND]
 
 Commands:
+  toolchain    Modify or query the installed toolchains
+  default      Set the default toolchain
   show         Show the active and installed toolchains or profiles
   update       Update Rust toolchains and rustup
   check        Check for updates to Rust toolchains and rustup
-  default      Set the default toolchain
-  toolchain    Modify or query the installed toolchains
   target       Modify a toolchain's supported targets
   component    Modify a toolchain's installed components
   override     Modify toolchain overrides for directories