bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/test_db.rs')
-rw-r--r--crates/hir-def/src/test_db.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/hir-def/src/test_db.rs b/crates/hir-def/src/test_db.rs
index 9edb03c7ca..f44472eae5 100644
--- a/crates/hir-def/src/test_db.rs
+++ b/crates/hir-def/src/test_db.rs
@@ -4,10 +4,10 @@ use std::{fmt, panic, sync::Mutex};
use base_db::{
salsa::{self, Durability},
- AnchoredPath, CrateId, FileId, FileLoader, FileLoaderDelegate, FilePosition, SourceDatabase,
- Upcast,
+ AnchoredPath, CrateId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast,
};
-use hir_expand::{db::ExpandDatabase, InFile};
+use hir_expand::{db::ExpandDatabase, files::FilePosition, InFile};
+use span::{EditionedFileId, FileId};
use syntax::{algo, ast, AstNode};
use triomphe::Arc;
@@ -85,7 +85,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() {
- if data.origin.file_id() == Some(file_id) {
+ if data.origin.file_id().map(EditionedFileId::file_id) == Some(file_id) {
return crate_def_map.module_id(local_id);
}
}
@@ -94,7 +94,7 @@ impl TestDB {
}
pub(crate) fn module_at_position(&self, position: FilePosition) -> ModuleId {
- let file_module = self.module_for_file(position.file_id);
+ let file_module = self.module_for_file(position.file_id.file_id());
let mut def_map = file_module.def_map(self);
let module = self.mod_at_position(&def_map, position);
@@ -122,7 +122,7 @@ impl TestDB {
let mut res = DefMap::ROOT;
for (module, data) in def_map.modules() {
let src = data.definition_source(self);
- if src.file_id != position.file_id.into() {
+ if src.file_id != position.file_id {
continue;
}
@@ -148,7 +148,6 @@ impl TestDB {
};
if size != Some(new_size) {
- cov_mark::hit!(submodule_in_testdb);
size = Some(new_size);
res = module;
}
@@ -163,7 +162,7 @@ impl TestDB {
let mut fn_def = None;
for (_, module) in def_map.modules() {
let file_id = module.definition_source(self).file_id;
- if file_id != position.file_id.into() {
+ if file_id != position.file_id {
continue;
}
for decl in module.scope.declarations() {