diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-05 16:23:22 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-05 16:23:22 +0100 |
| commit | f133159ec0b5037b58a26f52f8b37c545872dc7d (patch) | |
| tree | 49122142ee70da554fd5bf87ee058a7103d90773 /crates/ra_hir_def | |
| parent | 4029628f15c612182ad9da1c652078f9df62f5cf (diff) | |
| parent | bbb40d746368eb6a38498649a723c7ead0ef8136 (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_def')
| -rw-r--r-- | crates/ra_hir_def/src/test_db.rs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs index e7a5182f0..bcfa66ac9 100644 --- a/crates/ra_hir_def/src/test_db.rs +++ b/crates/ra_hir_def/src/test_db.rs | |||
| @@ -6,9 +6,7 @@ use std::{ | |||
| 6 | }; | 6 | }; |
| 7 | 7 | ||
| 8 | use hir_expand::db::AstDatabase; | 8 | use hir_expand::db::AstDatabase; |
| 9 | use ra_db::{ | 9 | use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast}; |
| 10 | salsa, CrateId, ExternSourceId, FileId, FileLoader, FileLoaderDelegate, RelativePath, Upcast, | ||
| 11 | }; | ||
| 12 | 10 | ||
| 13 | use crate::db::DefDatabase; | 11 | use crate::db::DefDatabase; |
| 14 | 12 | ||
| @@ -64,14 +62,6 @@ impl FileLoader for TestDB { | |||
| 64 | fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { | 62 | fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { |
| 65 | FileLoaderDelegate(self).relevant_crates(file_id) | 63 | FileLoaderDelegate(self).relevant_crates(file_id) |
| 66 | } | 64 | } |
| 67 | |||
| 68 | fn resolve_extern_path( | ||
| 69 | &self, | ||
| 70 | extern_id: ExternSourceId, | ||
| 71 | relative_path: &RelativePath, | ||
| 72 | ) -> Option<FileId> { | ||
| 73 | FileLoaderDelegate(self).resolve_extern_path(extern_id, relative_path) | ||
| 74 | } | ||
| 75 | } | 65 | } |
| 76 | 66 | ||
| 77 | impl TestDB { | 67 | impl TestDB { |
