bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix import suggestion error when failed not from starting

Browse source
This commit is contained in:
yukang 2024-07-01 13:05:23 +08:00
parent ad12a2a5fc
commit 8cc1ed81df
3 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1987,10 +1987,20 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
candidates
.sort_by_cached_key(|c| (c.path.segments.len(), pprust::path_to_string(&c.path)));
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"),
Some((
vec![(ident.span, pprust::path_to_string(&candidate.path))],
vec![(ident.span, pprust::path_to_string(&path))],
String::from("a similar path exists"),
Applicability::MaybeIncorrect,
)),