bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

suggest extern crate foo when failing to resolve use foo

Browse source 
fix ci error
This commit is contained in:
Takayuki Maeda 2022-05-22 11:48:35 +09:00 • committed by Takayuki Maeda
commit b2480a0251
26 changed files with 94 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -1836,9 +1836,18 @@ impl<'a> Resolver<'a> {
)),
)
} else if self.session.edition() == Edition::Edition2015 {
(format!("maybe a missing crate `{}`?", ident), None)
(
format!("maybe a missing crate `{ident}`?"),
Some((
vec![],
format!(
"consider adding `extern crate {ident}` to use the `{ident}` crate"
),
Applicability::MaybeIncorrect,
)),
)
} else {
(format!("could not find `{}` in the crate root", ident), None)
(format!("could not find `{ident}` in the crate root"), None)
}
} else if i > 0 {
let parent = path[i - 1].ident.name;
@ -1849,7 +1858,7 @@ impl<'a> Resolver<'a> {
"the list of imported crates".to_owned()
}
kw::PathRoot | kw::Crate => "the crate root".to_owned(),
_ => format!("`{}`", parent),
_ => format!("`{parent}`"),
};
let mut msg = format!("could not find `{}` in {}", ident, parent);

4
compiler/rustc_resolve/src/imports.rs
View file

@ -475,6 +475,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
}
if let Some((suggestions, msg, applicability)) = err.suggestion {
if suggestions.is_empty() {
diag.help(&msg);
continue;
}
diag.multipart_suggestion(&msg, suggestions, applicability);
}
}