From 7cbedc50bcf048c87f141a85418581076d67fc7a Mon Sep 17 00:00:00 2001 From: ice1000 Date: Tue, 3 Dec 2019 15:23:21 -0500 Subject: Fix test compilation --- crates/ra_hir_def/src/nameres.rs | 2 +- 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 { 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 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 { 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 }; } } -- cgit v1.2.3