language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

start cleaning up the resolution

Browse source 
Nameres related types, like `PerNs<Resolution>`, can represent
unreasonable situations, like a local in a type namespace. We should
clean this up, by requiring that call-site specifies the kind of
resolution it expects.
This commit is contained in:
Aleksey Kladov 2019-09-12 20:39:10 +03:00
parent 5c09c5949a
commit 63e1e63a91
5 changed files with 59 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_hir/src/source_binder.rs
View file

@ -29,7 +29,7 @@ use crate::{
path::{PathKind, PathSegment},
ty::method_resolution::implements_trait,
AsName, AstId, Const, Crate, DefWithBody, Either, Enum, Function, HasBody, HirFileId, MacroDef,
Module, ModuleDef, Name, Path, PerNs, Resolution, Resolver, Static, Struct, Trait, Ty,
Module, Name, Path, PerNs, Resolver, Static, Struct, Trait, Ty,
};
/// Locates the module by `FileId`. Picks topmost module in the file.
@ -426,11 +426,10 @@ impl SourceAnalyzer {
],
};
let std_future_trait =
match self.resolver.resolve_path_segments(db, &std_future_path).into_fully_resolved() {
PerNs { types: Some(Resolution::Def(ModuleDef::Trait(trait_))), .. } => trait_,
_ => return false,
};
let std_future_trait = match self.resolver.resolve_known_trait(db, &std_future_path) {
Some(it) => it,
_ => return false,
};
let krate = match self.resolver.krate() {
Some(krate) => krate,