diff options
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/test_db.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index cf2a83191..ca8cbcd42 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -164,7 +164,7 @@ impl ModuleOrigin { | |||
164 | ModuleOrigin::Root(None) => unreachable!(), | 164 | ModuleOrigin::Root(None) => unreachable!(), |
165 | ModuleOrigin::Inline(m) => InFile::new(m.file_id, Either::Right(m.to_node(db))), | 165 | ModuleOrigin::Inline(m) => InFile::new(m.file_id, Either::Right(m.to_node(db))), |
166 | // FIXME: right now it's never constructed, so it's fine to omit | 166 | // FIXME: right now it's never constructed, so it's fine to omit |
167 | ModuleOrigin::Block(b) => unimplemented!(), | 167 | ModuleOrigin::Block(_b) => unimplemented!(), |
168 | } | 168 | } |
169 | } | 169 | } |
170 | } | 170 | } |
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs index 1dc9793f9..476f6df52 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/ra_hir_ty/src/test_db.rs | |||
@@ -74,7 +74,7 @@ impl TestDB { | |||
74 | for &krate in self.relevant_crates(file_id).iter() { | 74 | for &krate in self.relevant_crates(file_id).iter() { |
75 | let crate_def_map = self.crate_def_map(krate); | 75 | let crate_def_map = self.crate_def_map(krate); |
76 | for (local_id, data) in crate_def_map.modules.iter() { | 76 | for (local_id, data) in crate_def_map.modules.iter() { |
77 | if data.definition == Some(file_id) { | 77 | if data.origin.file_id() == Some(file_id) { |
78 | return ModuleId { krate, local_id }; | 78 | return ModuleId { krate, local_id }; |
79 | } | 79 | } |
80 | } | 80 | } |