Skip to content

Commit 8ead58c

Browse files
committed
Remove WithOptconstParam.
1 parent d3b1001 commit 8ead58c

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

clippy_lints/src/non_copy_const.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,9 @@ fn is_value_unfrozen_poly<'tcx>(cx: &LateContext<'tcx>, body_id: BodyId, ty: Ty<
196196
fn is_value_unfrozen_expr<'tcx>(cx: &LateContext<'tcx>, hir_id: HirId, def_id: DefId, ty: Ty<'tcx>) -> bool {
197197
let substs = cx.typeck_results().node_substs(hir_id);
198198

199-
let result = cx.tcx.const_eval_resolve(
200-
cx.param_env,
201-
mir::UnevaluatedConst::new(ty::WithOptConstParam::unknown(def_id), substs),
202-
None,
203-
);
199+
let result = cx
200+
.tcx
201+
.const_eval_resolve(cx.param_env, mir::UnevaluatedConst::new(def_id, substs), None);
204202
is_value_unfrozen_raw(cx, result, ty)
205203
}
206204

clippy_utils/src/consts.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,7 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> {
450450
let result = self
451451
.lcx
452452
.tcx
453-
.const_eval_resolve(
454-
self.param_env,
455-
mir::UnevaluatedConst::new(ty::WithOptConstParam::unknown(def_id), substs),
456-
None,
457-
)
453+
.const_eval_resolve(self.param_env, mir::UnevaluatedConst::new(def_id, substs), None)
458454
.ok()
459455
.map(|val| rustc_middle::mir::ConstantKind::from_value(val, ty))?;
460456
let result = miri_to_const(self.lcx.tcx, result);

0 commit comments

Comments
 (0)