Provide different message for bootstrapped compiler
This commit is contained in:
parent
faa2fa7490
commit
310a204306
@ -48,13 +48,23 @@ fn third_party_crates() -> String {
|
||||
&& name.rsplit('.').next().map(|ext| ext.eq_ignore_ascii_case("rlib")) == Some(true)
|
||||
{
|
||||
if let Some(old) = crates.insert(dep, path.clone()) {
|
||||
// Check which action should be done in order to remove compiled deps.
|
||||
// If pre-installed version of compiler is used, `cargo clean` will do.
|
||||
// Otherwise (for bootstrapped compiler), the dependencies directory
|
||||
// must be removed manually.
|
||||
let suggested_action = if std::env::var_os("RUSTC_BOOTSTRAP").is_some() {
|
||||
"remove the stageN-tools directory"
|
||||
} else {
|
||||
"run `cargo clean`"
|
||||
};
|
||||
|
||||
panic!(
|
||||
"\n---------------------------------------------------\n\n \
|
||||
Found multiple rlibs for crate `{}`: `{:?}` and `{:?}`.\n \
|
||||
Probably, you need to run `cargo clean` before running tests again.\n \
|
||||
Probably, you need to {} before running tests again.\n \
|
||||
\nFor details on that error see https://github.com/rust-lang/rust-clippy/issues/7343 \
|
||||
\n---------------------------------------------------\n",
|
||||
dep, old, path
|
||||
dep, old, path, suggested_action
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user