diff options
author | Aleksey Kladov <[email protected]> | 2019-01-26 08:20:30 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-26 08:20:30 +0000 |
commit | 4711cbcace33e34d43f880d30c2778c843240f27 (patch) | |
tree | 7aae7fff41fcc67523f1f0b7a0fc06a174d00394 /crates/ra_ide_api/src/db.rs | |
parent | 3223de59765cae816099e8684a2caf13bc69bb2e (diff) |
rename FilesDatabase -> SourceDatabase
Diffstat (limited to 'crates/ra_ide_api/src/db.rs')
-rw-r--r-- | crates/ra_ide_api/src/db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index 119190e0a..3da93ec35 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
@@ -1,14 +1,14 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use ra_db::{ | 3 | use ra_db::{ |
4 | CheckCanceled, FileId, Canceled, FilesDatabase, | 4 | CheckCanceled, FileId, Canceled, SourceDatabase, |
5 | salsa, | 5 | salsa, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}}; | 8 | use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}}; |
9 | 9 | ||
10 | #[salsa::database( | 10 | #[salsa::database( |
11 | ra_db::FilesDatabaseStorage, | 11 | ra_db::SourceDatabaseStorage, |
12 | LineIndexDatabaseStorage, | 12 | LineIndexDatabaseStorage, |
13 | symbol_index::SymbolsDatabaseStorage, | 13 | symbol_index::SymbolsDatabaseStorage, |
14 | hir::db::HirDatabaseStorage | 14 | hir::db::HirDatabaseStorage |
@@ -59,11 +59,11 @@ impl AsRef<hir::HirInterner> for RootDatabase { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | #[salsa::query_group(LineIndexDatabaseStorage)] | 61 | #[salsa::query_group(LineIndexDatabaseStorage)] |
62 | pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + CheckCanceled { | 62 | pub(crate) trait LineIndexDatabase: ra_db::SourceDatabase + CheckCanceled { |
63 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; | 63 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; |
64 | } | 64 | } |
65 | 65 | ||
66 | fn line_index(db: &impl ra_db::FilesDatabase, file_id: FileId) -> Arc<LineIndex> { | 66 | fn line_index(db: &impl ra_db::SourceDatabase, file_id: FileId) -> Arc<LineIndex> { |
67 | let text = db.file_text(file_id); | 67 | let text = db.file_text(file_id); |
68 | Arc::new(LineIndex::new(&*text)) | 68 | Arc::new(LineIndex::new(&*text)) |
69 | } | 69 | } |