move Constness into TraitPredicate

2021-07-22 21:56:07 +08:00
parent 04c9901a08
commit 32390a0df6
49 changed files with 157 additions and 124 deletions
--- a/compiler/rustc_mir/src/transform/check_consts/check.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/check.rs
@@ -423,7 +423,7 @@ impl Checker<'mir, 'tcx> {
                    ty::PredicateKind::Subtype(_) => {
                        bug!("subtype predicate on function: {:#?}", predicate)
                    }
-                    ty::PredicateKind::Trait(pred, _constness) => {
+                    ty::PredicateKind::Trait(pred) => {
                        if Some(pred.def_id()) == tcx.lang_items().sized_trait() {
                            continue;
                        }
@@ -817,7 +817,10 @@ impl Visitor<'tcx> for Checker<'mir, 'tcx> {
                    let obligation = Obligation::new(
                        ObligationCause::dummy(),
                        param_env,
-                        Binder::dummy(TraitPredicate { trait_ref }),
+                        Binder::dummy(TraitPredicate {
+                            trait_ref,
+                            constness: hir::Constness::Const,
+                        }),
                    );

                    let implsrc = tcx.infer_ctxt().enter(|infcx| {