diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/db.rs | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 868df5b6b..d42161612 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -70,7 +70,7 @@ pub use crate::{ | |||
70 | pub use hir_def::{ | 70 | pub use hir_def::{ |
71 | builtin_type::BuiltinType, | 71 | builtin_type::BuiltinType, |
72 | docs::Documentation, | 72 | docs::Documentation, |
73 | nameres::{per_ns::PerNs, raw::ImportId}, | 73 | nameres::raw::ImportId, |
74 | path::{Path, PathKind}, | 74 | path::{Path, PathKind}, |
75 | type_ref::Mutability, | 75 | type_ref::Mutability, |
76 | }; | 76 | }; |
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index cf3a6ccd8..7fec2e8c0 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
@@ -17,28 +17,28 @@ use crate::{ | |||
17 | raw::{ImportSourceMap, RawItems}, | 17 | raw::{ImportSourceMap, RawItems}, |
18 | CrateDefMap, | 18 | CrateDefMap, |
19 | }, | 19 | }, |
20 | AttrDefId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, ImplId, ItemLoc, ModuleId, | 20 | AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, FunctionId, FunctionLoc, GenericDefId, |
21 | StaticId, StructOrUnionId, TraitId, TypeAliasId, | 21 | ImplId, ItemLoc, ModuleId, StaticId, StructOrUnionId, TraitId, TypeAliasId, TypeAliasLoc, |
22 | }; | 22 | }; |
23 | 23 | ||
24 | #[salsa::query_group(InternDatabaseStorage)] | 24 | #[salsa::query_group(InternDatabaseStorage)] |
25 | pub trait InternDatabase: SourceDatabase { | 25 | pub trait InternDatabase: SourceDatabase { |
26 | #[salsa::interned] | 26 | #[salsa::interned] |
27 | fn intern_function(&self, loc: crate::FunctionLoc) -> crate::FunctionId; | 27 | fn intern_function(&self, loc: FunctionLoc) -> FunctionId; |
28 | #[salsa::interned] | 28 | #[salsa::interned] |
29 | fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> crate::StructOrUnionId; | 29 | fn intern_struct_or_union(&self, loc: ItemLoc<ast::StructDef>) -> StructOrUnionId; |
30 | #[salsa::interned] | 30 | #[salsa::interned] |
31 | fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> crate::EnumId; | 31 | fn intern_enum(&self, loc: ItemLoc<ast::EnumDef>) -> EnumId; |
32 | #[salsa::interned] | 32 | #[salsa::interned] |
33 | fn intern_const(&self, loc: crate::ConstLoc) -> crate::ConstId; | 33 | fn intern_const(&self, loc: ConstLoc) -> ConstId; |
34 | #[salsa::interned] | 34 | #[salsa::interned] |
35 | fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> crate::StaticId; | 35 | fn intern_static(&self, loc: ItemLoc<ast::StaticDef>) -> StaticId; |
36 | #[salsa::interned] | 36 | #[salsa::interned] |
37 | fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> crate::TraitId; | 37 | fn intern_trait(&self, loc: ItemLoc<ast::TraitDef>) -> TraitId; |
38 | #[salsa::interned] | 38 | #[salsa::interned] |
39 | fn intern_type_alias(&self, loc: crate::TypeAliasLoc) -> crate::TypeAliasId; | 39 | fn intern_type_alias(&self, loc: TypeAliasLoc) -> TypeAliasId; |
40 | #[salsa::interned] | 40 | #[salsa::interned] |
41 | fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> crate::ImplId; | 41 | fn intern_impl(&self, loc: ItemLoc<ast::ImplBlock>) -> ImplId; |
42 | } | 42 | } |
43 | 43 | ||
44 | #[salsa::query_group(DefDatabaseStorage)] | 44 | #[salsa::query_group(DefDatabaseStorage)] |