diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-08 19:41:35 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-08 19:41:35 +0100 |
commit | 9c92c05ca614fcded456153b1bc6717d17f0dafb (patch) | |
tree | 4cdbfe1ae67d0eae6ba85b19cf40126898f43ac5 /crates/ra_hir/src/ty/lower.rs | |
parent | bb55111c209a9d3a6249cab35308a506b7f22d53 (diff) | |
parent | caefa6982bc57195687de11137997f1d62d791fe (diff) |
Merge #1386
1386: Remove one of the two different algorithms for name resolution of macros :D r=edwin0cheng a=matklad
r? @edwin0cheng
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/lower.rs')
-rw-r--r-- | crates/ra_hir/src/ty/lower.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index 71cd72234..26c213a41 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs | |||
@@ -65,7 +65,7 @@ impl Ty { | |||
65 | 65 | ||
66 | pub(crate) fn from_hir_path(db: &impl HirDatabase, resolver: &Resolver, path: &Path) -> Self { | 66 | pub(crate) fn from_hir_path(db: &impl HirDatabase, resolver: &Resolver, path: &Path) -> Self { |
67 | // Resolve the path (in type namespace) | 67 | // Resolve the path (in type namespace) |
68 | let resolution = resolver.resolve_path(db, path).take_types(); | 68 | let resolution = resolver.resolve_path_without_assoc_items(db, path).take_types(); |
69 | 69 | ||
70 | let def = match resolution { | 70 | let def = match resolution { |
71 | Some(Resolution::Def(def)) => def, | 71 | Some(Resolution::Def(def)) => def, |
@@ -216,7 +216,7 @@ impl TraitRef { | |||
216 | path: &Path, | 216 | path: &Path, |
217 | explicit_self_ty: Option<Ty>, | 217 | explicit_self_ty: Option<Ty>, |
218 | ) -> Option<Self> { | 218 | ) -> Option<Self> { |
219 | let resolved = match resolver.resolve_path(db, &path).take_types()? { | 219 | let resolved = match resolver.resolve_path_without_assoc_items(db, &path).take_types()? { |
220 | Resolution::Def(ModuleDef::Trait(tr)) => tr, | 220 | Resolution::Def(ModuleDef::Trait(tr)) => tr, |
221 | _ => return None, | 221 | _ => return None, |
222 | }; | 222 | }; |