aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src/hir/module/nameres.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-11-27 23:49:28 +0000
committerAleksey Kladov <[email protected]>2018-11-27 23:49:28 +0000
commitb2de95879a8d48cc4077895376b0aaed1e972169 (patch)
tree32b7ae7146237d3f861cf58c1dac70ed0d462059 /crates/ra_analysis/src/hir/module/nameres.rs
parentec45dfea1e37ba40ea3e2c8c6df0991a3d49213f (diff)
generalize location interner
Diffstat (limited to 'crates/ra_analysis/src/hir/module/nameres.rs')
-rw-r--r--crates/ra_analysis/src/hir/module/nameres.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/hir/module/nameres.rs b/crates/ra_analysis/src/hir/module/nameres.rs
index f22832eda..f48f51c8d 100644
--- a/crates/ra_analysis/src/hir/module/nameres.rs
+++ b/crates/ra_analysis/src/hir/module/nameres.rs
@@ -256,7 +256,7 @@ where
256 item_id: item.id, 256 item_id: item.id,
257 }, 257 },
258 }; 258 };
259 let def_id = self.db.id_maps().def_id(def_loc); 259 let def_id = def_loc.id(self.db);
260 let resolution = Resolution { 260 let resolution = Resolution {
261 def_id: Some(def_id), 261 def_id: Some(def_id),
262 import: None, 262 import: None,
@@ -269,7 +269,7 @@ where
269 id: mod_id, 269 id: mod_id,
270 source_root: self.source_root, 270 source_root: self.source_root,
271 }; 271 };
272 let def_id = self.db.id_maps().def_id(def_loc); 272 let def_id = def_loc.id(self.db);
273 let resolution = Resolution { 273 let resolution = Resolution {
274 def_id: Some(def_id), 274 def_id: Some(def_id),
275 import: None, 275 import: None,
@@ -318,7 +318,7 @@ where
318 }; 318 };
319 319
320 if !is_last { 320 if !is_last {
321 curr = match self.db.id_maps().def_loc(def_id) { 321 curr = match def_id.loc(self.db) {
322 DefLoc::Module { id, .. } => id, 322 DefLoc::Module { id, .. } => id,
323 _ => return, 323 _ => return,
324 } 324 }