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 | |
parent | 8b16af590dd3d241bec07f69f4d4dadae9a4b523 (diff) |
Rename GenericPredicate -> WhereClause
Diffstat (limited to 'crates/hir')
-rw-r--r-- | crates/hir/src/lib.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 300087f1f..268a2b901 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -57,8 +57,8 @@ use hir_ty::{ | |||
57 | to_assoc_type_id, | 57 | to_assoc_type_id, |
58 | traits::{FnTrait, Solution, SolutionVariables}, | 58 | traits::{FnTrait, Solution, SolutionVariables}, |
59 | AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, | 59 | AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, |
60 | GenericPredicate, InEnvironment, Interner, Obligation, ProjectionTy, Scalar, Substitution, Ty, | 60 | InEnvironment, Interner, Obligation, ProjectionTy, Scalar, Substitution, Ty, TyDefId, TyKind, |
61 | TyDefId, TyKind, TyVariableKind, | 61 | TyVariableKind, WhereClause, |
62 | }; | 62 | }; |
63 | use itertools::Itertools; | 63 | use itertools::Itertools; |
64 | use rustc_hash::FxHashSet; | 64 | use rustc_hash::FxHashSet; |
@@ -1461,7 +1461,7 @@ impl TypeParam { | |||
1461 | db.generic_predicates_for_param(self.id) | 1461 | db.generic_predicates_for_param(self.id) |
1462 | .into_iter() | 1462 | .into_iter() |
1463 | .filter_map(|pred| match &pred.value { | 1463 | .filter_map(|pred| match &pred.value { |
1464 | hir_ty::GenericPredicate::Implemented(trait_ref) => { | 1464 | hir_ty::WhereClause::Implemented(trait_ref) => { |
1465 | Some(Trait::from(trait_ref.hir_trait_id())) | 1465 | Some(Trait::from(trait_ref.hir_trait_id())) |
1466 | } | 1466 | } |
1467 | _ => None, | 1467 | _ => None, |
@@ -2022,7 +2022,7 @@ impl Type { | |||
2022 | self.ty.value.impl_trait_bounds(db).map(|it| { | 2022 | self.ty.value.impl_trait_bounds(db).map(|it| { |
2023 | it.into_iter() | 2023 | it.into_iter() |
2024 | .filter_map(|pred| match pred { | 2024 | .filter_map(|pred| match pred { |
2025 | hir_ty::GenericPredicate::Implemented(trait_ref) => { | 2025 | hir_ty::WhereClause::Implemented(trait_ref) => { |
2026 | Some(Trait::from(trait_ref.hir_trait_id())) | 2026 | Some(Trait::from(trait_ref.hir_trait_id())) |
2027 | } | 2027 | } |
2028 | _ => None, | 2028 | _ => None, |
@@ -2060,12 +2060,12 @@ impl Type { | |||
2060 | fn walk_bounds( | 2060 | fn walk_bounds( |
2061 | db: &dyn HirDatabase, | 2061 | db: &dyn HirDatabase, |
2062 | type_: &Type, | 2062 | type_: &Type, |
2063 | bounds: &[GenericPredicate], | 2063 | bounds: &[WhereClause], |
2064 | cb: &mut impl FnMut(Type), | 2064 | cb: &mut impl FnMut(Type), |
2065 | ) { | 2065 | ) { |
2066 | for pred in bounds { | 2066 | for pred in bounds { |
2067 | match pred { | 2067 | match pred { |
2068 | GenericPredicate::Implemented(trait_ref) => { | 2068 | WhereClause::Implemented(trait_ref) => { |
2069 | cb(type_.clone()); | 2069 | cb(type_.clone()); |
2070 | walk_substs(db, type_, &trait_ref.substitution, cb); | 2070 | walk_substs(db, type_, &trait_ref.substitution, cb); |
2071 | } | 2071 | } |