Fix import suggestion error when failed not from starting
This commit is contained in:
parent
ad12a2a5fc
commit
8cc1ed81df
@ -1987,10 +1987,20 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
|
|||||||
candidates
|
candidates
|
||||||
.sort_by_cached_key(|c| (c.path.segments.len(), pprust::path_to_string(&c.path)));
|
.sort_by_cached_key(|c| (c.path.segments.len(), pprust::path_to_string(&c.path)));
|
||||||
if let Some(candidate) = candidates.get(0) {
|
if let Some(candidate) = candidates.get(0) {
|
||||||
|
let path = {
|
||||||
|
// remove the possible common prefix of the path
|
||||||
|
let start_index = (0..failed_segment_idx)
|
||||||
|
.find(|&i| path[i].ident != candidate.path.segments[i].ident)
|
||||||
|
.unwrap_or_default();
|
||||||
|
let segments = (start_index..=failed_segment_idx)
|
||||||
|
.map(|s| candidate.path.segments[s].clone())
|
||||||
|
.collect();
|
||||||
|
Path { segments, span: Span::default(), tokens: None }
|
||||||
|
};
|
||||||
(
|
(
|
||||||
String::from("unresolved import"),
|
String::from("unresolved import"),
|
||||||
Some((
|
Some((
|
||||||
vec![(ident.span, pprust::path_to_string(&candidate.path))],
|
vec![(ident.span, pprust::path_to_string(&path))],
|
||||||
String::from("a similar path exists"),
|
String::from("a similar path exists"),
|
||||||
Applicability::MaybeIncorrect,
|
Applicability::MaybeIncorrect,
|
||||||
)),
|
)),
|
||||||
|
11
tests/ui/imports/suggest-import-issue-120074.rs
Normal file
11
tests/ui/imports/suggest-import-issue-120074.rs
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
pub mod foo {
|
||||||
|
pub mod bar {
|
||||||
|
pub fn do_the_thing() -> usize {
|
||||||
|
42
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
println!("Hello, {}!", crate::bar::do_the_thing); //~ ERROR failed to resolve: unresolved import
|
||||||
|
}
|
23
tests/ui/imports/suggest-import-issue-120074.stderr
Normal file
23
tests/ui/imports/suggest-import-issue-120074.stderr
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
error[E0433]: failed to resolve: unresolved import
|
||||||
|
--> $DIR/suggest-import-issue-120074.rs:10:35
|
||||||
|
|
|
||||||
|
LL | println!("Hello, {}!", crate::bar::do_the_thing);
|
||||||
|
| ^^^ unresolved import
|
||||||
|
|
|
||||||
|
help: a similar path exists
|
||||||
|
|
|
||||||
|
LL | println!("Hello, {}!", crate::foo::bar::do_the_thing);
|
||||||
|
| ~~~~~~~~
|
||||||
|
help: consider importing this module
|
||||||
|
|
|
||||||
|
LL + use foo::bar;
|
||||||
|
|
|
||||||
|
help: if you import `bar`, refer to it directly
|
||||||
|
|
|
||||||
|
LL - println!("Hello, {}!", crate::bar::do_the_thing);
|
||||||
|
LL + println!("Hello, {}!", bar::do_the_thing);
|
||||||
|
|
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0433`.
|
Loading…
x
Reference in New Issue
Block a user