language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Better strip turbofishes

Browse source
This commit is contained in:
Kirill Bulatov 2021-03-08 14:59:54 +02:00
parent 5168ab16e1
commit 778deb38fe
5 changed files with 52 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ide_db/src/helpers/import_assets.rs
View file

@ -5,7 +5,7 @@ use hir::{
};
use itertools::Itertools;
use rustc_hash::FxHashSet;
use syntax::{ast, AstNode, SyntaxNode};
use syntax::{ast, utils::path_to_string_stripping_turbo_fish, AstNode, SyntaxNode};
use crate::{
items_locator::{self, AssocItemSearch, DEFAULT_QUERY_SEARCH_LIMIT},
@ -57,7 +57,7 @@ pub struct PathImportCandidate {
#[derive(Debug)]
pub struct FirstSegmentUnresolved {
fist_segment: ast::NameRef,
full_qualifier: ModPath,
full_qualifier: ast::Path,
}
/// A name that will be used during item lookups.
@ -310,7 +310,7 @@ fn path_applicable_imports(
}
Some(first_segment_unresolved) => (
first_segment_unresolved.fist_segment.to_string(),
first_segment_unresolved.full_qualifier.to_string(),
path_to_string_stripping_turbo_fish(&first_segment_unresolved.full_qualifier),
),
};
@ -583,7 +583,7 @@ fn path_import_candidate(
ImportCandidate::Path(PathImportCandidate {
qualifier: Some(FirstSegmentUnresolved {
fist_segment: qualifier_start,
full_qualifier: ModPath::from_src_unhygienic(qualifier)?,
full_qualifier: qualifier,
}),
name,
})