aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-06-05 16:23:22 +0100
committerGitHub <[email protected]>2020-06-05 16:23:22 +0100
commitf133159ec0b5037b58a26f52f8b37c545872dc7d (patch)
tree49122142ee70da554fd5bf87ee058a7103d90773 /crates/ra_hir_ty
parent4029628f15c612182ad9da1c652078f9df62f5cf (diff)
parentbbb40d746368eb6a38498649a723c7ead0ef8136 (diff)
Merge #4760
4760: Minimize FileLoader interface r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty')
-rw-r--r--crates/ra_hir_ty/src/test_db.rs11
1 files changed, 1 insertions, 10 deletions
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index 21a3bdfd1..e484968a0 100644
--- a/crates/ra_hir_ty/src/test_db.rs
+++ b/crates/ra_hir_ty/src/test_db.rs
@@ -7,9 +7,7 @@ use std::{
7 7
8use hir_def::{db::DefDatabase, AssocItemId, ModuleDefId, ModuleId}; 8use hir_def::{db::DefDatabase, AssocItemId, ModuleDefId, ModuleId};
9use hir_expand::{db::AstDatabase, diagnostics::DiagnosticSink}; 9use hir_expand::{db::AstDatabase, diagnostics::DiagnosticSink};
10use ra_db::{ 10use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast};
11 salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath, SourceDatabase, Upcast,
12};
13use stdx::format_to; 11use stdx::format_to;
14 12
15use crate::{db::HirDatabase, diagnostics::Diagnostic, expr::ExprValidator}; 13use crate::{db::HirDatabase, diagnostics::Diagnostic, expr::ExprValidator};
@@ -78,13 +76,6 @@ impl FileLoader for TestDB {
78 fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { 76 fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
79 FileLoaderDelegate(self).relevant_crates(file_id) 77 FileLoaderDelegate(self).relevant_crates(file_id)
80 } 78 }
81 fn resolve_extern_path(
82 &self,
83 extern_id: ra_db::ExternSourceId,
84 relative_path: &RelativePath,
85 ) -> Option<FileId> {
86 FileLoaderDelegate(self).resolve_extern_path(extern_id, relative_path)
87 }
88} 79}
89 80
90impl TestDB { 81impl TestDB {