diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index cf2a831913be..ca8cbcd42bed 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -164,7 +164,7 @@ impl ModuleOrigin {
             ModuleOrigin::Root(None) => unreachable!(),
             ModuleOrigin::Inline(m) => InFile::new(m.file_id, Either::Right(m.to_node(db))),
             // FIXME: right now it's never constructed, so it's fine to omit
-            ModuleOrigin::Block(b) => unimplemented!(),
+            ModuleOrigin::Block(_b) => unimplemented!(),
         }
     }
 }
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index 1dc9793f950a..476f6df52a9a 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 {
         for &krate in self.relevant_crates(file_id).iter() {
             let crate_def_map = self.crate_def_map(krate);
             for (local_id, data) in crate_def_map.modules.iter() {
-                if data.definition == Some(file_id) {
+                if data.origin.file_id() == Some(file_id) {
                     return ModuleId { krate, local_id };
                 }
             }