diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index b7d5ab5c6a..eda22c0b09 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs @@ -95,27 +95,27 @@ pub trait DefDatabase: InternDatabase { #[salsa::invoke(crate::traits::TraitItemsIndex::trait_items_index)] fn trait_items_index(&self, module: Module) -> crate::traits::TraitItemsIndex; - #[salsa::invoke(RawItems::raw_items_query)] - fn raw_items(&self, file_id: HirFileId) -> Arc; - #[salsa::invoke(RawItems::raw_items_with_source_map_query)] fn raw_items_with_source_map( &self, file_id: HirFileId, ) -> (Arc, Arc); + #[salsa::invoke(RawItems::raw_items_query)] + fn raw_items(&self, file_id: HirFileId) -> Arc; + #[salsa::invoke(CrateDefMap::crate_def_map_query)] fn crate_def_map(&self, krate: Crate) -> Arc; - #[salsa::invoke(crate::impl_block::impls_in_module)] - fn impls_in_module(&self, module: Module) -> Arc; - #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)] fn impls_in_module_with_source_map( &self, module: Module, ) -> (Arc, Arc); + #[salsa::invoke(crate::impl_block::impls_in_module)] + fn impls_in_module(&self, module: Module) -> Arc; + #[salsa::invoke(crate::generics::GenericParams::generic_params_query)] fn generic_params(&self, def: GenericDef) -> Arc; diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs index 2dfedad01b..c0c289335e 100644 --- a/crates/ra_ide_api/src/change.rs +++ b/crates/ra_ide_api/src/change.rs @@ -269,11 +269,11 @@ impl RootDatabase { hir::db::EnumDataQuery hir::db::TraitDataQuery hir::db::TraitItemsIndexQuery - hir::db::RawItemsQuery hir::db::RawItemsWithSourceMapQuery + hir::db::RawItemsQuery hir::db::CrateDefMapQuery - hir::db::ImplsInModuleQuery hir::db::ImplsInModuleWithSourceMapQuery + hir::db::ImplsInModuleQuery hir::db::GenericParamsQuery hir::db::FnDataQuery hir::db::TypeAliasDataQuery