aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_db
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_ide_db
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_ide_db')
-rw-r--r--crates/ra_ide_db/src/lib.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index 93d5891a0..727d743b5 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -16,8 +16,8 @@ use std::sync::Arc;
16use hir::db::{AstDatabase, DefDatabase}; 16use hir::db::{AstDatabase, DefDatabase};
17use ra_db::{ 17use ra_db::{
18 salsa::{self, Database, Durability}, 18 salsa::{self, Database, Durability},
19 Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath, 19 Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase,
20 SourceDatabase, SourceRootId, Upcast, 20 SourceRootId, Upcast,
21}; 21};
22use rustc_hash::FxHashMap; 22use rustc_hash::FxHashMap;
23 23
@@ -63,13 +63,6 @@ impl FileLoader for RootDatabase {
63 fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> { 63 fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
64 FileLoaderDelegate(self).relevant_crates(file_id) 64 FileLoaderDelegate(self).relevant_crates(file_id)
65 } 65 }
66 fn resolve_extern_path(
67 &self,
68 extern_id: ra_db::ExternSourceId,
69 relative_path: &RelativePath,
70 ) -> Option<FileId> {
71 FileLoaderDelegate(self).resolve_extern_path(extern_id, relative_path)
72 }
73} 66}
74 67
75impl salsa::Database for RootDatabase { 68impl salsa::Database for RootDatabase {