Remove tip for --default-toolchain none

rust-lang · Feb 18, 2023 · 9d513b6 · 9d513b6
1 parent 342fa93
commit 9d513b6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/rustup-init.sh b/rustup-init.sh
@@ -42,9 +42,7 @@ FLAGS:
 
 OPTIONS:
         --default-host <default-host>              Choose a default host triple
-        --default-toolchain <default-toolchain>
-            Choose a default toolchain to install. Use 'none' to not install any toolchains at all
-
+        --default-toolchain <default-toolchain>    Choose a default toolchain to install
         --profile <profile>                         [default: default]  [possible values: minimal, default, complete]
     -c, --component <components>...                Component name to also install
     -t, --target <targets>...                      Target name to also install

diff --git a/src/cli/setup_mode.rs b/src/cli/setup_mode.rs
@@ -55,7 +55,7 @@ pub fn main() -> Result<utils::ExitCode> {
             Arg::with_name("default-toolchain")
                 .long("default-toolchain")
                 .takes_value(true)
-                .help("Choose a default toolchain to install. Use 'none' to not install any toolchains at all"),
+                .help("Choose a default toolchain to install"),
         )
         .arg(
             Arg::with_name("profile")

diff --git a/tests/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml b/tests/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml
@@ -19,9 +19,7 @@ FLAGS:
 
 OPTIONS:
         --default-host <default-host>              Choose a default host triple
-        --default-toolchain <default-toolchain>
-            Choose a default toolchain to install. Use 'none' to not install any toolchains at all
-
+        --default-toolchain <default-toolchain>    Choose a default toolchain to install
         --profile <profile>                         [default: default]  [possible values: minimal, default, complete]
     -c, --component <components>...                Component name to also install
     -t, --target <targets>...                      Target name to also install

diff --git a/tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml b/tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml
@@ -19,9 +19,7 @@ FLAGS:
 
 OPTIONS:
         --default-host <default-host>              Choose a default host triple
-        --default-toolchain <default-toolchain>
-            Choose a default toolchain to install. Use 'none' to not install any toolchains at all
-
+        --default-toolchain <default-toolchain>    Choose a default toolchain to install
         --profile <profile>                         [default: default]  [possible values: minimal, default, complete]
     -c, --component <components>...                Component name to also install
     -t, --target <targets>...                      Target name to also install