suggestion for typoed crate or module
avoid suggesting the same name sort candidates fix a message use `opt_def_id` instead of `def_id` move `find_similarly_named_module_or_crate` to rustc_resolve/src/diagnostics.rs
This commit is contained in:
parent
d7539a6af0
commit
f819e6d59c
@ -1277,6 +1277,34 @@ impl<'a> Resolver<'a> {
|
||||
|
||||
err.emit();
|
||||
}
|
||||
|
||||
crate fn find_similarly_named_module_or_crate(
|
||||
&mut self,
|
||||
ident: Symbol,
|
||||
current_module: &Module<'a>,
|
||||
) -> Option<Symbol> {
|
||||
let mut candidates = self
|
||||
.extern_prelude
|
||||
.iter()
|
||||
.map(|(ident, _)| ident.name)
|
||||
.chain(
|
||||
self.module_map
|
||||
.iter()
|
||||
.filter(|(_, module)| {
|
||||
current_module.is_ancestor_of(module) && !ptr::eq(current_module, *module)
|
||||
})
|
||||
.map(|(_, module)| module.kind.name())
|
||||
.flatten(),
|
||||
)
|
||||
.filter(|c| !c.to_string().is_empty())
|
||||
.collect::<Vec<_>>();
|
||||
candidates.sort();
|
||||
candidates.dedup();
|
||||
match find_best_match_for_name(&candidates, ident, None) {
|
||||
Some(sugg) if sugg == ident => None,
|
||||
sugg => sugg,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, 'b> ImportResolver<'a, 'b> {
|
||||
|
@ -2555,7 +2555,22 @@ impl<'a> Resolver<'a> {
|
||||
|
||||
(format!("use of undeclared type `{}`", ident), suggestion)
|
||||
} else {
|
||||
(format!("use of undeclared crate or module `{}`", ident), None)
|
||||
(
|
||||
format!("use of undeclared crate or module `{}`", ident),
|
||||
self.find_similarly_named_module_or_crate(
|
||||
ident.name,
|
||||
&parent_scope.module,
|
||||
)
|
||||
.map(|sugg| {
|
||||
(
|
||||
vec![(ident.span, sugg.to_string())],
|
||||
String::from(
|
||||
"there is a crate or module with a similar name",
|
||||
),
|
||||
Applicability::MaybeIncorrect,
|
||||
)
|
||||
}),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
let parent = path[i - 1].ident.name;
|
||||
|
@ -3,6 +3,11 @@ error[E0433]: failed to resolve: use of undeclared crate or module `a`
|
||||
|
|
||||
LL | a::bar();
|
||||
| ^ use of undeclared crate or module `a`
|
||||
|
|
||||
help: there is a crate or module with a similar name
|
||||
|
|
||||
LL | b::bar();
|
||||
| ~
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
17
src/test/ui/suggestions/crate-or-module-typo.rs
Normal file
17
src/test/ui/suggestions/crate-or-module-typo.rs
Normal file
@ -0,0 +1,17 @@
|
||||
// edition:2018
|
||||
|
||||
use st::cell::Cell; //~ ERROR failed to resolve: use of undeclared crate or module `st`
|
||||
|
||||
mod bar {
|
||||
pub fn bar() { bar::baz(); } //~ ERROR failed to resolve: use of undeclared crate or module `bar`
|
||||
|
||||
fn baz() {}
|
||||
}
|
||||
|
||||
use bas::bar; //~ ERROR unresolved import `bas`
|
||||
|
||||
struct Foo {
|
||||
bar: st::cell::Cell<bool> //~ ERROR failed to resolve: use of undeclared crate or module `st`
|
||||
}
|
||||
|
||||
fn main() {}
|
43
src/test/ui/suggestions/crate-or-module-typo.stderr
Normal file
43
src/test/ui/suggestions/crate-or-module-typo.stderr
Normal file
@ -0,0 +1,43 @@
|
||||
error[E0433]: failed to resolve: use of undeclared crate or module `st`
|
||||
--> $DIR/crate-or-module-typo.rs:3:5
|
||||
|
|
||||
LL | use st::cell::Cell;
|
||||
| ^^ use of undeclared crate or module `st`
|
||||
|
|
||||
help: there is a crate or module with a similar name
|
||||
|
|
||||
LL | use std::cell::Cell;
|
||||
| ~~~
|
||||
|
||||
error[E0432]: unresolved import `bas`
|
||||
--> $DIR/crate-or-module-typo.rs:11:5
|
||||
|
|
||||
LL | use bas::bar;
|
||||
| ^^^ use of undeclared crate or module `bas`
|
||||
|
|
||||
help: there is a crate or module with a similar name
|
||||
|
|
||||
LL | use bar::bar;
|
||||
| ~~~
|
||||
|
||||
error[E0433]: failed to resolve: use of undeclared crate or module `bar`
|
||||
--> $DIR/crate-or-module-typo.rs:6:20
|
||||
|
|
||||
LL | pub fn bar() { bar::baz(); }
|
||||
| ^^^ use of undeclared crate or module `bar`
|
||||
|
||||
error[E0433]: failed to resolve: use of undeclared crate or module `st`
|
||||
--> $DIR/crate-or-module-typo.rs:14:10
|
||||
|
|
||||
LL | bar: st::cell::Cell<bool>
|
||||
| ^^ use of undeclared crate or module `st`
|
||||
|
|
||||
help: there is a crate or module with a similar name
|
||||
|
|
||||
LL | bar: std::cell::Cell<bool>
|
||||
| ~~~
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
|
||||
Some errors have detailed explanations: E0432, E0433.
|
||||
For more information about an error, try `rustc --explain E0432`.
|
Loading…
x
Reference in New Issue
Block a user