diff options
Diffstat (limited to 'crates/ra_ide_api/src/db.rs')
-rw-r--r-- | crates/ra_ide_api/src/db.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index 30891aed4..02e12437c 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use ra_db::{ | 3 | use ra_db::{ |
4 | BaseDatabase, FileId, Canceled, | 4 | CheckCanceled, FileId, Canceled, |
5 | salsa::{self, Database}, | 5 | salsa::{self, Database}, |
6 | }; | 6 | }; |
7 | 7 | ||
@@ -9,7 +9,6 @@ use crate::{symbol_index, LineIndex}; | |||
9 | 9 | ||
10 | #[salsa::database( | 10 | #[salsa::database( |
11 | ra_db::FilesDatabaseStorage, | 11 | ra_db::FilesDatabaseStorage, |
12 | ra_db::SyntaxDatabaseStorage, | ||
13 | LineIndexDatabaseStorage, | 12 | LineIndexDatabaseStorage, |
14 | symbol_index::SymbolsDatabaseStorage, | 13 | symbol_index::SymbolsDatabaseStorage, |
15 | hir::db::HirDatabaseStorage | 14 | hir::db::HirDatabaseStorage |
@@ -54,7 +53,7 @@ impl salsa::ParallelDatabase for RootDatabase { | |||
54 | } | 53 | } |
55 | } | 54 | } |
56 | 55 | ||
57 | impl BaseDatabase for RootDatabase {} | 56 | impl CheckCanceled for RootDatabase {} |
58 | 57 | ||
59 | impl AsRef<hir::HirInterner> for RootDatabase { | 58 | impl AsRef<hir::HirInterner> for RootDatabase { |
60 | fn as_ref(&self) -> &hir::HirInterner { | 59 | fn as_ref(&self) -> &hir::HirInterner { |
@@ -63,7 +62,7 @@ impl AsRef<hir::HirInterner> for RootDatabase { | |||
63 | } | 62 | } |
64 | 63 | ||
65 | #[salsa::query_group(LineIndexDatabaseStorage)] | 64 | #[salsa::query_group(LineIndexDatabaseStorage)] |
66 | pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase { | 65 | pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + CheckCanceled { |
67 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; | 66 | fn line_index(&self, file_id: FileId) -> Arc<LineIndex>; |
68 | } | 67 | } |
69 | 68 | ||