diff options
author | Aleksey Kladov <[email protected]> | 2019-10-30 14:40:13 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-10-30 15:04:24 +0000 |
commit | c1ed9ccc4ed7dfff3abb6eb01d7c311c8e31108c (patch) | |
tree | dc95229fc0863b46fe3d60cf25c2a56cdc4c8b39 /crates/ra_hir/src/db.rs | |
parent | e5300ad3baf80c9903235a98a12b6cfd409e9f10 (diff) |
fix compilation
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 142d7338d..ebfd970eb 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -23,7 +23,10 @@ use crate::{ | |||
23 | Struct, StructField, Trait, TypeAlias, | 23 | Struct, StructField, Trait, TypeAlias, |
24 | }; | 24 | }; |
25 | 25 | ||
26 | pub use hir_def::db::{InternDatabase, InternDatabaseStorage}; | 26 | pub use hir_def::db::{ |
27 | DefDatabase2, DefDatabase2Storage, InternDatabase, InternDatabaseStorage, RawItemsQuery, | ||
28 | RawItemsWithSourceMapQuery, | ||
29 | }; | ||
27 | pub use hir_expand::db::{ | 30 | pub use hir_expand::db::{ |
28 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 31 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
29 | ParseMacroQuery, | 32 | ParseMacroQuery, |
@@ -32,7 +35,7 @@ pub use hir_expand::db::{ | |||
32 | // This database uses `AstDatabase` internally, | 35 | // This database uses `AstDatabase` internally, |
33 | #[salsa::query_group(DefDatabaseStorage)] | 36 | #[salsa::query_group(DefDatabaseStorage)] |
34 | #[salsa::requires(AstDatabase)] | 37 | #[salsa::requires(AstDatabase)] |
35 | pub trait DefDatabase: HirDebugDatabase + hir_def::db::DefDatabase2 { | 38 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { |
36 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] | 39 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] |
37 | fn struct_data(&self, s: Struct) -> Arc<StructData>; | 40 | fn struct_data(&self, s: Struct) -> Arc<StructData>; |
38 | 41 | ||