Avoid storing the ImplPolarity and Constness next to a TraitRef and use TraitPredicate instead

2021-10-25 14:29:54 +00:00
parent d161cc2071
commit a848c4ba3f
11 changed files with 59 additions and 53 deletions
--- a/compiler/rustc_middle/src/traits/select.rs
+++ b/compiler/rustc_middle/src/traits/select.rs
@@ -101,7 +101,7 @@ pub enum SelectionCandidate<'tcx> {
        /// `false` if there are no *further* obligations.
        has_nested: bool,
    },
-    ParamCandidate((ty::ConstnessAnd<ty::PolyTraitRef<'tcx>>, ty::ImplPolarity)),
+    ParamCandidate(ty::PolyTraitPredicate<'tcx>),
    ImplCandidate(DefId),
    AutoImplCandidate(DefId),