Skip to content

Remove the mixed singular/plural phrasing as “component(s)” #4682

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

Merged
djc merged 1 commit into from
Jan 16, 2026
Merged

Remove the mixed singular/plural phrasing as “component(s)” #4682

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
10 changes: 9 additions & 1 deletion src/dist/manifestation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,15 @@ impl Manifestation {
}

if !components.is_empty() {
info!("downloading component(s)");
if components.len() > 2 {
info!("downloading {} components", components.len());
} else {
info!(
"downloading component {}",
components[0].manifest.short_name(&components[0].component),
);
};

let mut stream = InstallEvents::new(components.into_iter(), Arc::new(self));
let mut transaction = Some(tx);
tx = loop {
Expand Down
13 changes: 5 additions & 8 deletions tests/suite/cli_exact.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ async fn update_once() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading 4 components
info: default toolchain set to nightly-[HOST_TRIPLE]

"#]]);
Expand Down Expand Up @@ -69,8 +68,8 @@ rustup - Update available : [CURRENT_VERSION] -> [TEST_VERSION]
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading 4 components

"#]]);
cx.config
.expect(["rustup", "+nightly", "component", "list", "--installed"])
Expand Down Expand Up @@ -112,8 +111,7 @@ async fn update_once_and_self_update() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading 4 components
info: checking for self-update (current version: [CURRENT_VERSION])
info: downloading self-update (new version: [TEST_VERSION])

Expand Down Expand Up @@ -323,8 +321,7 @@ async fn default() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading 4 components
info: default toolchain set to nightly-[HOST_TRIPLE]

"#]]);
Expand Down
9 changes: 3 additions & 6 deletions tests/suite/cli_rustup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,7 @@ async fn default() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading 4 components
info: default toolchain set to nightly-[HOST_TRIPLE]

"#]])
Expand Down Expand Up @@ -1708,8 +1707,7 @@ channel = "nightly"
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading component rustc
info: the active toolchain `nightly-[HOST_TRIPLE]` has been installed
info: it's active because: overridden by '[TOOLCHAIN_FILE]'

Expand Down Expand Up @@ -3893,8 +3891,7 @@ async fn custom_toolchain_with_components_toolchains_profile_does_not_err() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
info: downloading component[..]
...
info: downloading component cargo
info: default toolchain set to nightly-[HOST_TRIPLE]

"#]])
Expand Down
2 changes: 1 addition & 1 deletion tests/suite/cli_rustup_ui/rustup_default.stderr.term.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/suite/cli_rustup_ui/rustup_update_updated.stderr.term.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions tests/suite/cli_self_upd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ async fn install_bins_to_cargo_home() {
...
info: syncing channel updates for stable-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.1.0 (hash-stable-1.1.0)
info: downloading component[..]
...
info: downloading 4 components
info: default toolchain set to stable-[HOST_TRIPLE]

"#]])
Expand Down Expand Up @@ -117,8 +116,7 @@ async fn proxies_are_relative_symlinks() {
...
info: syncing channel updates for stable-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.1.0 (hash-stable-1.1.0)
info: downloading component[..]
...
info: downloading 4 components
info: default toolchain set to stable-[HOST_TRIPLE]
...
"#]])
Expand Down
12 changes: 6 additions & 6 deletions tests/suite/cli_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ async fn remove_override_toolchain_err_handling() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for beta-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.2.0 (hash-beta-1.2.0)
info: downloading component[..]
...
info: downloading 4 components

"#]])
.is_ok();
cx.config
Expand Down Expand Up @@ -520,8 +520,8 @@ async fn file_override_toolchain_err_handling() {
.with_stderr(snapbox::str![[r#"
info: syncing channel updates for beta-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.2.0 (hash-beta-1.2.0)
info: downloading component[..]
...
info: downloading 4 components

"#]])
.is_ok();
cx.config
Expand Down Expand Up @@ -2481,8 +2481,8 @@ async fn run_with_install_flag_against_unavailable_component() {
info: syncing channel updates for nightly-[HOST_TRIPLE]
info: latest update on 2015-01-02 for version 1.3.0 (hash-nightly-2)
warn: skipping unavailable component rust-std
info: downloading component[..]
...
info: downloading 3 components

"#]])
.is_ok();
cx.config
Expand Down