diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index ebfd970eb..89ca4e39f 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -6,7 +6,6 @@ use ra_db::salsa; | |||
6 | use ra_syntax::SmolStr; | 6 | use ra_syntax::SmolStr; |
7 | 7 | ||
8 | use crate::{ | 8 | use crate::{ |
9 | adt::{EnumData, StructData}, | ||
10 | debug::HirDebugDatabase, | 9 | debug::HirDebugDatabase, |
11 | generics::{GenericDef, GenericParams}, | 10 | generics::{GenericDef, GenericParams}, |
12 | ids, | 11 | ids, |
@@ -19,13 +18,13 @@ use crate::{ | |||
19 | InferenceResult, Substs, Ty, TypableDef, TypeCtor, | 18 | InferenceResult, Substs, Ty, TypableDef, TypeCtor, |
20 | }, | 19 | }, |
21 | type_alias::TypeAliasData, | 20 | type_alias::TypeAliasData, |
22 | Const, ConstData, Crate, DefWithBody, Enum, ExprScopes, FnData, Function, Module, Static, | 21 | Const, ConstData, Crate, DefWithBody, ExprScopes, FnData, Function, Module, Static, |
23 | Struct, StructField, Trait, TypeAlias, | 22 | StructField, Trait, TypeAlias, |
24 | }; | 23 | }; |
25 | 24 | ||
26 | pub use hir_def::db::{ | 25 | pub use hir_def::db::{ |
27 | DefDatabase2, DefDatabase2Storage, InternDatabase, InternDatabaseStorage, RawItemsQuery, | 26 | DefDatabase2, DefDatabase2Storage, EnumDataQuery, InternDatabase, InternDatabaseStorage, |
28 | RawItemsWithSourceMapQuery, | 27 | RawItemsQuery, RawItemsWithSourceMapQuery, StructDataQuery, |
29 | }; | 28 | }; |
30 | pub use hir_expand::db::{ | 29 | pub use hir_expand::db::{ |
31 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 30 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
@@ -36,12 +35,6 @@ pub use hir_expand::db::{ | |||
36 | #[salsa::query_group(DefDatabaseStorage)] | 35 | #[salsa::query_group(DefDatabaseStorage)] |
37 | #[salsa::requires(AstDatabase)] | 36 | #[salsa::requires(AstDatabase)] |
38 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { | 37 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { |
39 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] | ||
40 | fn struct_data(&self, s: Struct) -> Arc<StructData>; | ||
41 | |||
42 | #[salsa::invoke(crate::adt::EnumData::enum_data_query)] | ||
43 | fn enum_data(&self, e: Enum) -> Arc<EnumData>; | ||
44 | |||
45 | #[salsa::invoke(crate::traits::TraitData::trait_data_query)] | 38 | #[salsa::invoke(crate::traits::TraitData::trait_data_query)] |
46 | fn trait_data(&self, t: Trait) -> Arc<TraitData>; | 39 | fn trait_data(&self, t: Trait) -> Arc<TraitData>; |
47 | 40 | ||