diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 8b9af0565..85d46b485 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -16,15 +16,15 @@ use crate::{ | |||
16 | CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef, | 16 | CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef, |
17 | TypeCtor, | 17 | TypeCtor, |
18 | }, | 18 | }, |
19 | Const, ConstData, Crate, DefWithBody, GenericDef, ImplBlock, Module, Static, StructField, | 19 | Crate, DefWithBody, GenericDef, ImplBlock, Module, StructField, Trait, |
20 | Trait, | ||
21 | }; | 20 | }; |
22 | 21 | ||
23 | pub use hir_def::db::{ | 22 | pub use hir_def::db::{ |
24 | BodyQuery, BodyWithSourceMapQuery, CrateDefMapQuery, DefDatabase2, DefDatabase2Storage, | 23 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, DefDatabase2, |
25 | EnumDataQuery, ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery, | 24 | DefDatabase2Storage, EnumDataQuery, ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, |
26 | InternDatabase, InternDatabaseStorage, RawItemsQuery, RawItemsWithSourceMapQuery, | 25 | ImplDataQuery, InternDatabase, InternDatabaseStorage, RawItemsQuery, |
27 | StructDataQuery, TraitDataQuery, TypeAliasDataQuery, | 26 | RawItemsWithSourceMapQuery, StaticDataQuery, StructDataQuery, TraitDataQuery, |
27 | TypeAliasDataQuery, | ||
28 | }; | 28 | }; |
29 | pub use hir_expand::db::{ | 29 | pub use hir_expand::db::{ |
30 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 30 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
@@ -35,12 +35,6 @@ pub use hir_expand::db::{ | |||
35 | #[salsa::query_group(DefDatabaseStorage)] | 35 | #[salsa::query_group(DefDatabaseStorage)] |
36 | #[salsa::requires(AstDatabase)] | 36 | #[salsa::requires(AstDatabase)] |
37 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { | 37 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { |
38 | #[salsa::invoke(ConstData::const_data_query)] | ||
39 | fn const_data(&self, konst: Const) -> Arc<ConstData>; | ||
40 | |||
41 | #[salsa::invoke(ConstData::static_data_query)] | ||
42 | fn static_data(&self, konst: Static) -> Arc<ConstData>; | ||
43 | |||
44 | #[salsa::invoke(LangItems::module_lang_items_query)] | 38 | #[salsa::invoke(LangItems::module_lang_items_query)] |
45 | fn module_lang_items(&self, module: Module) -> Option<Arc<LangItems>>; | 39 | fn module_lang_items(&self, module: Module) -> Option<Arc<LangItems>>; |
46 | 40 | ||