aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 3d7ec5683..e8abac5bc 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -149,10 +149,7 @@ impl Scope {
149 if let Some(KnownName::SelfParam) = name.as_known_name() { 149 if let Some(KnownName::SelfParam) = name.as_known_name() {
150 PerNs::types(Resolution::Def(m.module.into())) 150 PerNs::types(Resolution::Def(m.module.into()))
151 } else { 151 } else {
152 match m.item_map[m.module.module_id].get(name) { 152 m.item_map.resolve_name_in_module(m.module, name).map(Resolution::Def)
153 Some(res) => res.def.map(Resolution::Def),
154 None => PerNs::none(),
155 }
156 } 153 }
157 } 154 }
158 Scope::GenericParams(gp) => match gp.find_by_name(name) { 155 Scope::GenericParams(gp) => match gp.find_by_name(name) {
@@ -177,7 +174,7 @@ impl Scope {
177 } 174 }
178 } 175 }
179 176
180 fn collect_names(&self, f: &mut FnMut(Name, PerNs<Resolution>)) { 177 fn collect_names(&self, f: &mut dyn FnMut(Name, PerNs<Resolution>)) {
181 match self { 178 match self {
182 Scope::ModuleScope(m) => { 179 Scope::ModuleScope(m) => {
183 // TODO: should we provide `self` here? 180 // TODO: should we provide `self` here?