rustup rust-lang/rust#66877

Author: matthiaskrgr

clippy_lints/src/consts.rs

@@ -345,7 +345,7 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
                     promoted: None,
                 };
 
-                let result = self.lcx.tcx.const_eval(self.param_env.and(gid)).ok()?;
+                let result = self.lcx.tcx.const_eval_validated(self.param_env.and(gid)).ok()?;
                 let result = miri_to_const(&result);
                 if result.is_some() {
                     self.needed_resolution = true;

clippy_lints/src/enum_clike.rs

@@ -56,7 +56,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnportableVariant {
                         instance,
                         promoted: None,
                     };
-                    let constant = cx.tcx.const_eval(param_env.and(c_id)).ok();
+                    let constant = cx.tcx.const_eval_validated(param_env.and(c_id)).ok();
                     if let Some(Constant::Int(val)) = constant.and_then(miri_to_const) {
                         let mut ty = cx.tcx.type_of(def_id);
                         if let ty::Adt(adt, _) = ty.kind {