Skip to content

Give a better error when std is missing for a target #2732

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
kinnison merged 1 commit into from
Apr 29, 2021
Merged

Give a better error when std is missing for a target #2732

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
15 changes: 10 additions & 5 deletions src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,16 @@ error_chain! {
}
UnknownComponent(t: String, c: String, s: Option<String>) {
description("toolchain does not contain component")
display("toolchain '{}' does not contain component {}{}", t, c, if let Some(suggestion) = s {
format!("; did you mean '{}'?", suggestion)
} else {
"".to_string()
})
display("toolchain '{}' does not contain component {}{}{}", t, c, if let Some(suggestion) = s {
format!("; did you mean '{}'?", suggestion)
} else {
"".to_string()
}, if c.contains("rust-std") {
format!("\nnote: not all platforms have the standard library pre-compiled: https://doc.rust-lang.org/nightly/rustc/platform-support.html{}",
if t.contains("nightly") { "\nhelp: consider using `cargo build -Z build-std` instead" } else { "" }
)
} else { "".to_string() }
)
}
UnknownProfile(p: String) {
description("unknown profile name")
Expand Down
4 changes: 3 additions & 1 deletion tests/cli-v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,9 @@ fn add_target_bogus() {
expect_err(
config,
&["rustup", "target", "add", "bogus"],
"does not contain component 'rust-std' for target 'bogus'",
"does not contain component 'rust-std' for target 'bogus'\n\
note: not all platforms have the standard library pre-compiled: https://doc.rust-lang.org/nightly/rustc/platform-support.html\n\
help: consider using `cargo build -Z build-std` instead",
);
});
}
Expand Down