Replace ConstnessAnd<TraitRef> with TraitPredicate which conveys the same information

2021-10-25 14:04:15 +00:00
parent b16c811f1c
commit d161cc2071
2 changed files with 46 additions and 69 deletions
--- a/compiler/rustc_middle/src/traits/select.rs
+++ b/compiler/rustc_middle/src/traits/select.rs
@@ -16,10 +16,8 @@ pub type SelectionCache<'tcx> = Cache<
    SelectionResult<'tcx, SelectionCandidate<'tcx>>,
 >;

-pub type EvaluationCache<'tcx> = Cache<
-    (ty::ParamEnvAnd<'tcx, ty::ConstnessAnd<ty::PolyTraitRef<'tcx>>>, ty::ImplPolarity),
-    EvaluationResult,
->;
+pub type EvaluationCache<'tcx> =
+    Cache<ty::ParamEnvAnd<'tcx, ty::PolyTraitPredicate<'tcx>>, EvaluationResult>;

 /// The selection process begins by considering all impls, where
 /// clauses, and so forth that might resolve an obligation. Sometimes