diff options
Diffstat (limited to 'crates/ra_hir_ty/src/db.rs')
-rw-r--r-- | crates/ra_hir_ty/src/db.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs index eb521c7a0..fea122a8b 100644 --- a/crates/ra_hir_ty/src/db.rs +++ b/crates/ra_hir_ty/src/db.rs | |||
@@ -12,8 +12,8 @@ use ra_prof::profile; | |||
12 | use crate::{ | 12 | use crate::{ |
13 | method_resolution::CrateImplBlocks, | 13 | method_resolution::CrateImplBlocks, |
14 | traits::{chalk, AssocTyValue, Impl}, | 14 | traits::{chalk, AssocTyValue, Impl}, |
15 | CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, TraitRef, Ty, TyDefId, TypeCtor, | 15 | CallableDef, PolyFnSig, GenericPredicate, InferenceResult, Substs, TraitRef, Ty, TyDefId, TypeCtor, |
16 | ValueTyDefId, | 16 | ValueTyDefId, Binders, |
17 | }; | 17 | }; |
18 | 18 | ||
19 | #[salsa::query_group(HirDatabaseStorage)] | 19 | #[salsa::query_group(HirDatabaseStorage)] |
@@ -27,14 +27,14 @@ pub trait HirDatabase: DefDatabase { | |||
27 | 27 | ||
28 | #[salsa::invoke(crate::lower::ty_query)] | 28 | #[salsa::invoke(crate::lower::ty_query)] |
29 | #[salsa::cycle(crate::lower::ty_recover)] | 29 | #[salsa::cycle(crate::lower::ty_recover)] |
30 | fn ty(&self, def: TyDefId) -> Ty; | 30 | fn ty(&self, def: TyDefId) -> Binders<Ty>; |
31 | 31 | ||
32 | #[salsa::invoke(crate::lower::value_ty_query)] | 32 | #[salsa::invoke(crate::lower::value_ty_query)] |
33 | fn value_ty(&self, def: ValueTyDefId) -> Ty; | 33 | fn value_ty(&self, def: ValueTyDefId) -> Binders<Ty>; |
34 | 34 | ||
35 | #[salsa::invoke(crate::lower::impl_self_ty_query)] | 35 | #[salsa::invoke(crate::lower::impl_self_ty_query)] |
36 | #[salsa::cycle(crate::lower::impl_self_ty_recover)] | 36 | #[salsa::cycle(crate::lower::impl_self_ty_recover)] |
37 | fn impl_self_ty(&self, def: ImplId) -> Ty; | 37 | fn impl_self_ty(&self, def: ImplId) -> Binders<Ty>; |
38 | 38 | ||
39 | #[salsa::invoke(crate::lower::impl_trait_query)] | 39 | #[salsa::invoke(crate::lower::impl_trait_query)] |
40 | fn impl_trait(&self, def: ImplId) -> Option<TraitRef>; | 40 | fn impl_trait(&self, def: ImplId) -> Option<TraitRef>; |
@@ -43,7 +43,7 @@ pub trait HirDatabase: DefDatabase { | |||
43 | fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalStructFieldId, Ty>>; | 43 | fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalStructFieldId, Ty>>; |
44 | 44 | ||
45 | #[salsa::invoke(crate::callable_item_sig)] | 45 | #[salsa::invoke(crate::callable_item_sig)] |
46 | fn callable_item_signature(&self, def: CallableDef) -> FnSig; | 46 | fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig; |
47 | 47 | ||
48 | #[salsa::invoke(crate::lower::generic_predicates_for_param_query)] | 48 | #[salsa::invoke(crate::lower::generic_predicates_for_param_query)] |
49 | #[salsa::cycle(crate::lower::generic_predicates_for_param_recover)] | 49 | #[salsa::cycle(crate::lower::generic_predicates_for_param_recover)] |