Move ty::{CoercePredicate, PolyCoercePredicate} to their own little module (cute)

Author: WaffleLapkin

compiler/rustc_middle/src/ty/mod.rs

@@ -156,9 +156,10 @@ mod visibility;
 pub use bound_constness::BoundConstness;
 pub use impl_polarity::ImplPolarity;
 pub use predicate::{
-    InstantiatedPredicates, OutlivesPredicate, PolyRegionOutlivesPredicate, PolySubtypePredicate,
-    PolyTraitPredicate, PolyTypeOutlivesPredicate, Predicate, PredicateKind,
-    RegionOutlivesPredicate, SubtypePredicate, TraitPredicate, TypeOutlivesPredicate,
+    CoercePredicate, InstantiatedPredicates, OutlivesPredicate, PolyCoercePredicate,
+    PolyRegionOutlivesPredicate, PolySubtypePredicate, PolyTraitPredicate,
+    PolyTypeOutlivesPredicate, Predicate, PredicateKind, RegionOutlivesPredicate, SubtypePredicate,
+    TraitPredicate, TypeOutlivesPredicate,
 };
 pub use visibility::Visibility;
 
@@ -397,15 +398,6 @@ pub struct CratePredicatesMap<'tcx> {
     pub predicates: FxHashMap<DefId, &'tcx [(Clause<'tcx>, Span)]>,
 }
 
-/// Encodes that we have to coerce *from* the `a` type to the `b` type.
-#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, TyEncodable, TyDecodable)]
-#[derive(HashStable, TypeFoldable, TypeVisitable, Lift)]
-pub struct CoercePredicate<'tcx> {
-    pub a: Ty<'tcx>,
-    pub b: Ty<'tcx>,
-}
-pub type PolyCoercePredicate<'tcx> = ty::Binder<'tcx, CoercePredicate<'tcx>>;
-
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Term<'tcx> {
     ptr: NonZeroUsize,

compiler/rustc_middle/src/ty/predicate.rs

@@ -6,16 +6,18 @@ use rustc_hir::def_id::DefId;
 use rustc_type_ir::WithCachedTypeInfo;
 
 use crate::ty::{
-    self, AliasRelationDirection, Binder, BoundConstness, Clause, ClosureKind, CoercePredicate,
-    Const, DebruijnIndex, EarlyBinder, GenericArg, PolyProjectionPredicate, SubstsRef, Term, Ty,
+    self, AliasRelationDirection, Binder, BoundConstness, Clause, ClosureKind, Const,
+    DebruijnIndex, EarlyBinder, GenericArg, PolyProjectionPredicate, SubstsRef, Term, Ty,
     TypeFlags,
 };
 
+mod coerce_predicate;
 mod instantiated_predicates;
 mod outlives_predicate;
 mod subtype_predicate;
 mod trait_predicate;
 
+pub use coerce_predicate::{CoercePredicate, PolyCoercePredicate};
 pub use instantiated_predicates::InstantiatedPredicates;
 pub use outlives_predicate::{
     OutlivesPredicate, PolyRegionOutlivesPredicate, PolyTypeOutlivesPredicate,

compiler/rustc_middle/src/ty/predicate/coerce_predicate.rs

@@ -0,0 +1,11 @@
+use crate::ty::{self, Ty};
+
+pub type PolyCoercePredicate<'tcx> = ty::Binder<'tcx, CoercePredicate<'tcx>>;
+
+/// Encodes that we have to coerce *from* the `a` type to the `b` type.
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, TyEncodable, TyDecodable)]
+#[derive(HashStable, TypeFoldable, TypeVisitable, Lift)]
+pub struct CoercePredicate<'tcx> {
+    pub a: Ty<'tcx>,
+    pub b: Ty<'tcx>,
+}