aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/src/nameres.rs2
-rw-r--r--crates/ra_hir/src/resolve.rs4
2 files changed, 4 insertions, 2 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 8b798d6c9..dc0dd23c9 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -323,6 +323,8 @@ impl CrateDefMap {
323 (res.resolved_def, res.segment_index) 323 (res.resolved_def, res.segment_index)
324 } 324 }
325 325
326 // FIXME: This seems to do the same work as `resolve_path_with_macro`, but
327 // using a completely different code path. Seems bad, huh?
326 pub(crate) fn find_macro( 328 pub(crate) fn find_macro(
327 &self, 329 &self,
328 db: &impl DefDatabase, 330 db: &impl DefDatabase,
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 0f6ee7f47..d6956f45e 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -148,8 +148,8 @@ impl Resolver {
148 PathResult::from_resolution(self.resolve_name(db, &Name::self_param())) 148 PathResult::from_resolution(self.resolve_name(db, &Name::self_param()))
149 } else { 149 } else {
150 let (item_map, module) = match self.module() { 150 let (item_map, module) = match self.module() {
151 Some(m) => m, 151 Some(it) => it,
152 _ => return PathResult::empty(), 152 None => return PathResult::empty(),
153 }; 153 };
154 let (module_res, segment_index) = item_map.resolve_path(db, module, path); 154 let (module_res, segment_index) = item_map.resolve_path(db, module, path);
155 155