diff options
Diffstat (limited to 'crates/ra_hir_def/src/db.rs')
| -rw-r--r-- | crates/ra_hir_def/src/db.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index e4ffdebe9..c6cd4369b 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
| @@ -13,26 +13,26 @@ use crate::{ | |||
| 13 | raw::{ImportSourceMap, RawItems}, | 13 | raw::{ImportSourceMap, RawItems}, |
| 14 | CrateDefMap, | 14 | CrateDefMap, |
| 15 | }, | 15 | }, |
| 16 | traits::{TraitData, TraitItemsIndex}, | 16 | traits::TraitData, |
| 17 | DefWithBodyId, EnumId, FunctionLoc, ImplId, ItemLoc, ModuleId, StructOrUnionId, TraitId, | 17 | DefWithBodyId, EnumId, ImplId, ItemLoc, StructOrUnionId, TraitId, |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | #[salsa::query_group(InternDatabaseStorage)] | 20 | #[salsa::query_group(InternDatabaseStorage)] |
| 21 | pub trait InternDatabase: SourceDatabase { | 21 | pub trait InternDatabase: SourceDatabase { |
| 22 | #[salsa::interned] | 22 | #[salsa::interned] |
| 23 | fn intern_function(&self, loc: FunctionLoc) -> crate::FunctionId; | 23 | fn intern_function(&self, loc: crate::FunctionLoc) -> crate::FunctionId; |
| 24 | #[salsa::interned] | 24 | #[salsa::interned] |
| 25 | fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> crate::StructOrUnionId; | 25 | fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> crate::StructOrUnionId; |
| 26 | #[salsa::interned] | 26 | #[salsa::interned] |
| 27 | fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> crate::EnumId; | 27 | fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> crate::EnumId; |
| 28 | #[salsa::interned] | 28 | #[salsa::interned] |
| 29 | fn intern_const(&self, loc: ItemLoc<ast::ConstDef>) -> crate::ConstId; | 29 | fn intern_const(&self, loc: crate::ConstLoc) -> crate::ConstId; |
| 30 | #[salsa::interned] | 30 | #[salsa::interned] |
| 31 | fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> crate::StaticId; | 31 | fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> crate::StaticId; |
| 32 | #[salsa::interned] | 32 | #[salsa::interned] |
| 33 | fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> crate::TraitId; | 33 | fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> crate::TraitId; |
| 34 | #[salsa::interned] | 34 | #[salsa::interned] |
| 35 | fn intern_type_alias(&self, loc: ItemLoc<ast::TypeAliasDef>) -> crate::TypeAliasId; | 35 | fn intern_type_alias(&self, loc: crate::TypeAliasLoc) -> crate::TypeAliasId; |
| 36 | #[salsa::interned] | 36 | #[salsa::interned] |
| 37 | fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> crate::ImplId; | 37 | fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> crate::ImplId; |
| 38 | } | 38 | } |
| @@ -63,9 +63,6 @@ pub trait DefDatabase2: InternDatabase + AstDatabase { | |||
| 63 | #[salsa::invoke(TraitData::trait_data_query)] | 63 | #[salsa::invoke(TraitData::trait_data_query)] |
| 64 | fn trait_data(&self, e: TraitId) -> Arc<TraitData>; | 64 | fn trait_data(&self, e: TraitId) -> Arc<TraitData>; |
| 65 | 65 | ||
| 66 | #[salsa::invoke(TraitItemsIndex::trait_items_index)] | ||
| 67 | fn trait_items_index(&self, module: ModuleId) -> TraitItemsIndex; | ||
| 68 | |||
| 69 | #[salsa::invoke(Body::body_with_source_map_query)] | 66 | #[salsa::invoke(Body::body_with_source_map_query)] |
| 70 | fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>); | 67 | fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>); |
| 71 | 68 | ||