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

Jump to bottom

Improve clarity of "adding req. component" error #1255

Merged
merged 1 commit into from
Sep 21, 2017
Merged

Improve clarity of "adding req. component" error #1255

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
2 changes: 1 addition & 1 deletion src/rustup/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ error_chain! {
}
AddingRequiredComponent(t: String, c: Component) {
description("required component cannot be added")
display("component {} is required for toolchain '{}' and cannot be re-added",
display("component {} was automatically added because it is required for toolchain '{}'",
c.description(), t)
}
ParsingSettings(e: Vec<toml::ParserError>) {
Expand Down
2 changes: 1 addition & 1 deletion tests/cli-v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ fn add_target_host() {
let trip = TargetTriple::from_build();
expect_ok(config, &["rustup", "default", "nightly"]);
expect_err(config, &["rustup", "target", "add", &trip.to_string()],
for_host!("component 'rust-std' for target '{0}' is required for toolchain 'nightly-{0}' and cannot be re-added"));
for_host!("component 'rust-std' for target '{0}' was automatically added because it is required for toolchain 'nightly-{0}'"));
});
}

Expand Down