Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rustup-init): fix typo in rustup-init[.sh] args #3818

Merged
merged 1 commit into from
May 10, 2024
Merged

fix(rustup-init): fix typo in rustup-init[.sh] args #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rustup-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Options:
Choose a default toolchain to install. Use 'none' to not install any toolchains at all
--profile <PROFILE>
[default: default] [possible values: minimal, default, complete]
-c, --components <COMPONENTS>...
-c, --component <COMPONENT>...
Component name to also install
-t, --targets <TARGETS>...
-t, --target <TARGET>...
Target name to also install
--no-update-default-toolchain
Don't update any existing default toolchain after install
Expand Down
12 changes: 6 additions & 6 deletions src/cli/setup_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ struct RustupInit {

/// Component name to also install
#[arg(short, long, value_delimiter = ',', num_args = 1..)]
components: Vec<String>,
component: Vec<String>,

/// Target name to also install
#[arg(short, long, value_delimiter = ',', num_args = 1..)]
targets: Vec<String>,
target: Vec<String>,

/// Don't update any existing default toolchain after install
#[arg(long)]
Expand Down Expand Up @@ -85,8 +85,8 @@ pub fn main() -> Result<utils::ExitCode> {
default_host,
default_toolchain,
profile,
components,
targets,
component,
target,
no_update_default_toolchain,
no_modify_path,
self_replace,
Expand Down Expand Up @@ -119,8 +119,8 @@ pub fn main() -> Result<utils::ExitCode> {
profile,
no_modify_path,
no_update_toolchain: no_update_default_toolchain,
components: &components.iter().map(|s| &**s).collect::<Vec<_>>(),
targets: &targets.iter().map(|s| &**s).collect::<Vec<_>>(),
components: &component.iter().map(|s| &**s).collect::<Vec<_>>(),
targets: &target.iter().map(|s| &**s).collect::<Vec<_>>(),
};

self_update::install(no_prompt, verbose, quiet, opts)
Expand Down
4 changes: 2 additions & 2 deletions tests/suite/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Options:
Choose a default toolchain to install. Use 'none' to not install any toolchains at all
--profile <PROFILE>
[default: default] [possible values: minimal, default, complete]
-c, --components <COMPONENTS>...
-c, --component <COMPONENT>...
Component name to also install
-t, --targets <TARGETS>...
-t, --target <TARGET>...
Target name to also install
--no-update-default-toolchain
Don't update any existing default toolchain after install
Expand Down
4 changes: 2 additions & 2 deletions tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ Options:
Choose a default toolchain to install. Use 'none' to not install any toolchains at all
--profile <PROFILE>
[default: default] [possible values: minimal, default, complete]
-c, --components <COMPONENTS>...
-c, --component <COMPONENT>...
Component name to also install
-t, --targets <TARGETS>...
-t, --target <TARGET>...
Target name to also install
--no-update-default-toolchain
Don't update any existing default toolchain after install
Expand Down
Loading