diff options
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 189649841..6b21fe744 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -19,32 +19,20 @@ use crate::{ | |||
19 | ids::SourceFileItemId, | 19 | ids::SourceFileItemId, |
20 | }; | 20 | }; |
21 | 21 | ||
22 | #[salsa::query_group(HirDatabaseStorage)] | 22 | #[salsa::query_group(PersistentHirDatabaseStorage)] |
23 | pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> { | 23 | pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> { |
24 | #[salsa::invoke(HirFileId::hir_parse)] | 24 | #[salsa::invoke(HirFileId::hir_parse)] |
25 | fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>; | 25 | fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>; |
26 | 26 | ||
27 | #[salsa::invoke(crate::macros::expand_macro_invocation)] | 27 | #[salsa::invoke(crate::macros::expand_macro_invocation)] |
28 | fn expand_macro_invocation(&self, invoc: MacroCallId) -> Option<Arc<MacroExpansion>>; | 28 | fn expand_macro_invocation(&self, invoc: MacroCallId) -> Option<Arc<MacroExpansion>>; |
29 | 29 | ||
30 | #[salsa::invoke(ExprScopes::expr_scopes_query)] | ||
31 | fn expr_scopes(&self, func: Function) -> Arc<ExprScopes>; | ||
32 | |||
33 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] | 30 | #[salsa::invoke(crate::adt::StructData::struct_data_query)] |
34 | fn struct_data(&self, s: Struct) -> Arc<StructData>; | 31 | fn struct_data(&self, s: Struct) -> Arc<StructData>; |
35 | 32 | ||
36 | #[salsa::invoke(crate::adt::EnumData::enum_data_query)] | 33 | #[salsa::invoke(crate::adt::EnumData::enum_data_query)] |
37 | fn enum_data(&self, e: Enum) -> Arc<EnumData>; | 34 | fn enum_data(&self, e: Enum) -> Arc<EnumData>; |
38 | 35 | ||
39 | #[salsa::invoke(crate::ty::infer)] | ||
40 | fn infer(&self, func: Function) -> Arc<InferenceResult>; | ||
41 | |||
42 | #[salsa::invoke(crate::ty::type_for_def)] | ||
43 | fn type_for_def(&self, def: TypableDef) -> Ty; | ||
44 | |||
45 | #[salsa::invoke(crate::ty::type_for_field)] | ||
46 | fn type_for_field(&self, field: StructField) -> Ty; | ||
47 | |||
48 | #[salsa::invoke(query_definitions::file_items)] | 36 | #[salsa::invoke(query_definitions::file_items)] |
49 | fn file_items(&self, file_id: HirFileId) -> Arc<SourceFileItems>; | 37 | fn file_items(&self, file_id: HirFileId) -> Arc<SourceFileItems>; |
50 | 38 | ||
@@ -73,20 +61,38 @@ pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> { | |||
73 | #[salsa::invoke(crate::module_tree::ModuleTree::module_tree_query)] | 61 | #[salsa::invoke(crate::module_tree::ModuleTree::module_tree_query)] |
74 | fn module_tree(&self, krate: Crate) -> Arc<ModuleTree>; | 62 | fn module_tree(&self, krate: Crate) -> Arc<ModuleTree>; |
75 | 63 | ||
64 | #[salsa::invoke(crate::impl_block::impls_in_module)] | ||
65 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; | ||
66 | |||
67 | #[salsa::invoke(crate::impl_block::impls_in_module_source_map_query)] | ||
68 | fn impls_in_module_source_map(&self, module: Module) -> Arc<ImplSourceMap>; | ||
69 | |||
76 | #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)] | 70 | #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)] |
77 | fn impls_in_module_with_source_map( | 71 | fn impls_in_module_with_source_map( |
78 | &self, | 72 | &self, |
79 | module: Module, | 73 | module: Module, |
80 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>); | 74 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>); |
81 | 75 | ||
82 | #[salsa::invoke(crate::impl_block::impls_in_module)] | 76 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] |
83 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; | 77 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; |
84 | 78 | ||
85 | #[salsa::invoke(crate::impl_block::impls_in_module_source_map_query)] | 79 | #[salsa::invoke(crate::FnSignature::fn_signature_query)] |
86 | fn impls_in_module_source_map(&self, module: Module) -> Arc<ImplSourceMap>; | 80 | fn fn_signature(&self, func: Function) -> Arc<FnSignature>; |
81 | } | ||
87 | 82 | ||
88 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] | 83 | #[salsa::query_group(HirDatabaseStorage)] |
89 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; | 84 | pub trait HirDatabase: PersistentHirDatabase { |
85 | #[salsa::invoke(ExprScopes::expr_scopes_query)] | ||
86 | fn expr_scopes(&self, func: Function) -> Arc<ExprScopes>; | ||
87 | |||
88 | #[salsa::invoke(crate::ty::infer)] | ||
89 | fn infer(&self, func: Function) -> Arc<InferenceResult>; | ||
90 | |||
91 | #[salsa::invoke(crate::ty::type_for_def)] | ||
92 | fn type_for_def(&self, def: TypableDef) -> Ty; | ||
93 | |||
94 | #[salsa::invoke(crate::ty::type_for_field)] | ||
95 | fn type_for_field(&self, field: StructField) -> Ty; | ||
90 | 96 | ||
91 | #[salsa::invoke(crate::expr::body_hir)] | 97 | #[salsa::invoke(crate::expr::body_hir)] |
92 | fn body_hir(&self, func: Function) -> Arc<crate::expr::Body>; | 98 | fn body_hir(&self, func: Function) -> Arc<crate::expr::Body>; |
@@ -94,9 +100,6 @@ pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> { | |||
94 | #[salsa::invoke(crate::expr::body_syntax_mapping)] | 100 | #[salsa::invoke(crate::expr::body_syntax_mapping)] |
95 | fn body_syntax_mapping(&self, func: Function) -> Arc<crate::expr::BodySyntaxMapping>; | 101 | fn body_syntax_mapping(&self, func: Function) -> Arc<crate::expr::BodySyntaxMapping>; |
96 | 102 | ||
97 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] | 103 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] |
98 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; | 104 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; |
99 | |||
100 | #[salsa::invoke(crate::FnSignature::fn_signature_query)] | ||
101 | fn fn_signature(&self, func: Function) -> Arc<FnSignature>; | ||
102 | } | 105 | } |