diff options
author | Florian Diebold <[email protected]> | 2021-03-20 09:46:36 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2021-03-20 09:46:36 +0000 |
commit | 7a5fb37cf12f4e25ce1ba7e464dd257408444bfb (patch) | |
tree | fedc1b02375558b9bd027a318c4bc131784d58c6 /crates/hir_ty/src/db.rs | |
parent | 8b16af590dd3d241bec07f69f4d4dadae9a4b523 (diff) |
Rename GenericPredicate -> WhereClause
Diffstat (limited to 'crates/hir_ty/src/db.rs')
-rw-r--r-- | crates/hir_ty/src/db.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crates/hir_ty/src/db.rs b/crates/hir_ty/src/db.rs index 74a048672..300da0f38 100644 --- a/crates/hir_ty/src/db.rs +++ b/crates/hir_ty/src/db.rs | |||
@@ -12,8 +12,8 @@ use la_arena::ArenaMap; | |||
12 | use crate::{ | 12 | use crate::{ |
13 | method_resolution::{InherentImpls, TraitImpls}, | 13 | method_resolution::{InherentImpls, TraitImpls}, |
14 | traits::chalk, | 14 | traits::chalk, |
15 | Binders, CallableDefId, FnDefId, GenericPredicate, ImplTraitId, InferenceResult, PolyFnSig, | 15 | Binders, CallableDefId, FnDefId, ImplTraitId, InferenceResult, PolyFnSig, ReturnTypeImplTraits, |
16 | ReturnTypeImplTraits, TraitRef, Ty, TyDefId, ValueTyDefId, | 16 | TraitRef, Ty, TyDefId, ValueTyDefId, WhereClause, |
17 | }; | 17 | }; |
18 | use hir_expand::name::Name; | 18 | use hir_expand::name::Name; |
19 | 19 | ||
@@ -57,13 +57,10 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> { | |||
57 | 57 | ||
58 | #[salsa::invoke(crate::lower::generic_predicates_for_param_query)] | 58 | #[salsa::invoke(crate::lower::generic_predicates_for_param_query)] |
59 | #[salsa::cycle(crate::lower::generic_predicates_for_param_recover)] | 59 | #[salsa::cycle(crate::lower::generic_predicates_for_param_recover)] |
60 | fn generic_predicates_for_param( | 60 | fn generic_predicates_for_param(&self, param_id: TypeParamId) -> Arc<[Binders<WhereClause>]>; |
61 | &self, | ||
62 | param_id: TypeParamId, | ||
63 | ) -> Arc<[Binders<GenericPredicate>]>; | ||
64 | 61 | ||
65 | #[salsa::invoke(crate::lower::generic_predicates_query)] | 62 | #[salsa::invoke(crate::lower::generic_predicates_query)] |
66 | fn generic_predicates(&self, def: GenericDefId) -> Arc<[Binders<GenericPredicate>]>; | 63 | fn generic_predicates(&self, def: GenericDefId) -> Arc<[Binders<WhereClause>]>; |
67 | 64 | ||
68 | #[salsa::invoke(crate::lower::trait_environment_query)] | 65 | #[salsa::invoke(crate::lower::trait_environment_query)] |
69 | fn trait_environment(&self, def: GenericDefId) -> Arc<crate::TraitEnvironment>; | 66 | fn trait_environment(&self, def: GenericDefId) -> Arc<crate::TraitEnvironment>; |