diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-19 11:12:54 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-19 11:12:54 +0000 |
commit | 98d29d4f538899a8bd8caac7f4d2459438a1ae9a (patch) | |
tree | 49fc49a406fed5f239a5a8a7cee4cf52fb56e568 /crates/hir_ty/src/lower.rs | |
parent | 26fdd17cc6fc79b476977c2a40a90de7095e4b45 (diff) | |
parent | 8996b1a2353539cb9c264d0effbde80567de6586 (diff) |
Merge #8101
8101: Replace Projection variant in GenericPredicate with AliasEq r=flodiebold a=Veykril
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/lower.rs')
-rw-r--r-- | crates/hir_ty/src/lower.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 5d950a017..7d22c3df5 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs | |||
@@ -33,8 +33,8 @@ use crate::{ | |||
33 | all_super_trait_refs, associated_type_by_name_including_super_traits, generics, | 33 | all_super_trait_refs, associated_type_by_name_including_super_traits, generics, |
34 | variant_data, | 34 | variant_data, |
35 | }, | 35 | }, |
36 | AliasTy, Binders, BoundVar, CallableSig, DebruijnIndex, FnPointer, FnSig, GenericPredicate, | 36 | AliasEq, AliasTy, Binders, BoundVar, CallableSig, DebruijnIndex, FnPointer, FnSig, |
37 | ImplTraitId, OpaqueTy, PolyFnSig, ProjectionPredicate, ProjectionTy, ReturnTypeImplTrait, | 37 | GenericPredicate, ImplTraitId, OpaqueTy, PolyFnSig, ProjectionTy, ReturnTypeImplTrait, |
38 | ReturnTypeImplTraits, Substitution, TraitEnvironment, TraitRef, Ty, TyKind, TypeWalk, | 38 | ReturnTypeImplTraits, Substitution, TraitEnvironment, TraitRef, Ty, TyKind, TypeWalk, |
39 | }; | 39 | }; |
40 | 40 | ||
@@ -750,9 +750,9 @@ impl<'a> TyLoweringContext<'a> { | |||
750 | ); | 750 | ); |
751 | if let Some(type_ref) = &binding.type_ref { | 751 | if let Some(type_ref) = &binding.type_ref { |
752 | let ty = self.lower_ty(type_ref); | 752 | let ty = self.lower_ty(type_ref); |
753 | let projection_predicate = | 753 | let alias_eq = |
754 | ProjectionPredicate { projection_ty: projection_ty.clone(), ty }; | 754 | AliasEq { alias: AliasTy::Projection(projection_ty.clone()), ty }; |
755 | preds.push(GenericPredicate::Projection(projection_predicate)); | 755 | preds.push(GenericPredicate::AliasEq(alias_eq)); |
756 | } | 756 | } |
757 | for bound in &binding.bounds { | 757 | for bound in &binding.bounds { |
758 | preds.extend(self.lower_type_bound( | 758 | preds.extend(self.lower_type_bound( |