update const_eval_resolve

2021-03-13 16:31:38 +01:00 · 2021-03-13 16:31:38 +01:00 · 7c9b5b4ce0
commit 7c9b5b4ce0
parent 43ebac119b
13 changed files with 45 additions and 55 deletions
--- a/compiler/rustc_trait_selection/src/traits/auto_trait.rs
+++ b/compiler/rustc_trait_selection/src/traits/auto_trait.rs
@ -803,17 +803,10 @@ impl AutoTraitFinder<'tcx> {
                }
                ty::PredicateKind::ConstEquate(c1, c2) => {
                    let evaluate = |c: &'tcx ty::Const<'tcx>| {
-                        if let ty::ConstKind::Unevaluated(ty::Unevaluated {
-                            def,
-                            substs,
-                            promoted,
-                        }) = c.val
-                        {
+                        if let ty::ConstKind::Unevaluated(unevaluated) = c.val {
                            match select.infcx().const_eval_resolve(
                                obligation.param_env,
-                                def,
-                                substs,
-                                promoted,
+                                unevaluated,
                                Some(obligation.cause.span),
                            ) {
                                Ok(val) => Ok(ty::Const::from_value(select.tcx(), val, c.ty)),