bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/test_db.rs')
-rw-r--r--crates/hir-ty/src/test_db.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/hir-ty/src/test_db.rs b/crates/hir-ty/src/test_db.rs
index 693d39f596..d2bba120b6 100644
--- a/crates/hir-ty/src/test_db.rs
+++ b/crates/hir-ty/src/test_db.rs
@@ -8,9 +8,10 @@ use base_db::{
};
use hir_def::{ModuleId, db::DefDatabase};
+use hir_expand::EditionedFileId;
use rustc_hash::FxHashMap;
use salsa::{AsDynDatabase, Durability};
-use span::{EditionedFileId, FileId};
+use span::FileId;
use syntax::TextRange;
use test_utils::extract_annotations;
use triomphe::Arc;
@@ -119,7 +120,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().map(EditionedFileId::file_id) == Some(file_id) {
+ if data.origin.file_id().map(|file_id| file_id.file_id(self)) == Some(file_id) {
return Some(crate_def_map.module_id(local_id));
}
}
@@ -145,7 +146,7 @@ impl TestDB {
files
.into_iter()
.filter_map(|file_id| {
- let text = self.file_text(file_id.file_id());
+ let text = self.file_text(file_id.file_id(self));
let annotations = extract_annotations(&text.text(self));
if annotations.is_empty() {
return None;