language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix test compilation

Browse source
This commit is contained in:
ice1000 2019-12-03 15:23:21 -05:00
parent 1bb59a7d08
commit 7cbedc50bc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir_def/src/nameres.rs
View file

@ -164,7 +164,7 @@ impl ModuleOrigin {
ModuleOrigin::Root(None) => unreachable!(), ModuleOrigin::Root(None) => unreachable!(),
ModuleOrigin::Inline(m) => InFile::new(m.file_id, Either::Right(m.to_node(db))), 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 // FIXME: right now it's never constructed, so it's fine to omit
ModuleOrigin::Block(b) => unimplemented!(), ModuleOrigin::Block(_b) => unimplemented!(),
} }
} }
} }

2
crates/ra_hir_ty/src/test_db.rs
View file

@ -74,7 +74,7 @@ impl TestDB {
for &krate in self.relevant_crates(file_id).iter() { for &krate in self.relevant_crates(file_id).iter() {
let crate_def_map = self.crate_def_map(krate); let crate_def_map = self.crate_def_map(krate);
for (local_id, data) in crate_def_map.modules.iter() { 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 }; return ModuleId { krate, local_id };
} }
} }