diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir/src/db.rs | 12 | ||||
-rw-r--r-- | crates/ra_ide_api/src/change.rs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index b7d5ab5c6..eda22c0b0 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -95,27 +95,27 @@ pub trait DefDatabase: InternDatabase { | |||
95 | #[salsa::invoke(crate::traits::TraitItemsIndex::trait_items_index)] | 95 | #[salsa::invoke(crate::traits::TraitItemsIndex::trait_items_index)] |
96 | fn trait_items_index(&self, module: Module) -> crate::traits::TraitItemsIndex; | 96 | fn trait_items_index(&self, module: Module) -> crate::traits::TraitItemsIndex; |
97 | 97 | ||
98 | #[salsa::invoke(RawItems::raw_items_query)] | ||
99 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; | ||
100 | |||
101 | #[salsa::invoke(RawItems::raw_items_with_source_map_query)] | 98 | #[salsa::invoke(RawItems::raw_items_with_source_map_query)] |
102 | fn raw_items_with_source_map( | 99 | fn raw_items_with_source_map( |
103 | &self, | 100 | &self, |
104 | file_id: HirFileId, | 101 | file_id: HirFileId, |
105 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>); | 102 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>); |
106 | 103 | ||
104 | #[salsa::invoke(RawItems::raw_items_query)] | ||
105 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; | ||
106 | |||
107 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] | 107 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] |
108 | fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>; | 108 | fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>; |
109 | 109 | ||
110 | #[salsa::invoke(crate::impl_block::impls_in_module)] | ||
111 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; | ||
112 | |||
113 | #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)] | 110 | #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)] |
114 | fn impls_in_module_with_source_map( | 111 | fn impls_in_module_with_source_map( |
115 | &self, | 112 | &self, |
116 | module: Module, | 113 | module: Module, |
117 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>); | 114 | ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>); |
118 | 115 | ||
116 | #[salsa::invoke(crate::impl_block::impls_in_module)] | ||
117 | fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>; | ||
118 | |||
119 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] | 119 | #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] |
120 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; | 120 | fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>; |
121 | 121 | ||
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs index 2dfedad01..c0c289335 100644 --- a/crates/ra_ide_api/src/change.rs +++ b/crates/ra_ide_api/src/change.rs | |||
@@ -269,11 +269,11 @@ impl RootDatabase { | |||
269 | hir::db::EnumDataQuery | 269 | hir::db::EnumDataQuery |
270 | hir::db::TraitDataQuery | 270 | hir::db::TraitDataQuery |
271 | hir::db::TraitItemsIndexQuery | 271 | hir::db::TraitItemsIndexQuery |
272 | hir::db::RawItemsQuery | ||
273 | hir::db::RawItemsWithSourceMapQuery | 272 | hir::db::RawItemsWithSourceMapQuery |
273 | hir::db::RawItemsQuery | ||
274 | hir::db::CrateDefMapQuery | 274 | hir::db::CrateDefMapQuery |
275 | hir::db::ImplsInModuleQuery | ||
276 | hir::db::ImplsInModuleWithSourceMapQuery | 275 | hir::db::ImplsInModuleWithSourceMapQuery |
276 | hir::db::ImplsInModuleQuery | ||
277 | hir::db::GenericParamsQuery | 277 | hir::db::GenericParamsQuery |
278 | hir::db::FnDataQuery | 278 | hir::db::FnDataQuery |
279 | hir::db::TypeAliasDataQuery | 279 | hir::db::TypeAliasDataQuery |