Skip to content

Commit 6c25def

Browse files
committed
Replace rustc_middle_ty::Const::try_eval_target_usize
The method is removed, so replace try_eval_target_usize with a normalization (with param_env so it works generically) and conversion.
1 parent 9f5949f commit 6c25def

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/preempt_count/adjustment.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ memoize!(
425425

426426
ty::Array(elem_ty, size) => {
427427
let size = size
428-
.try_eval_target_usize(cx.tcx, param_env)
428+
.normalize_internal(cx.tcx, param_env)
429+
.try_to_target_usize(cx.tcx)
429430
.ok_or(Error::TooGeneric);
430431
if size == Ok(0) {
431432
return Ok(0);

src/preempt_count/expectation.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ impl<'tcx> AnalysisCtxt<'tcx> {
425425

426426
let elem_adj = self.drop_adjustment(param_and_elem_ty)?;
427427
let size = size
428-
.try_eval_target_usize(self.tcx, param_env)
428+
.normalize_internal(self.tcx, param_env)
429+
.try_to_target_usize(self.tcx)
429430
.ok_or(Error::TooGeneric)?;
430431
let Ok(size) = i32::try_from(size) else {
431432
return Ok(());
@@ -743,7 +744,8 @@ memoize!(
743744

744745
ty::Array(elem_ty, size) => {
745746
let size = size
746-
.try_eval_target_usize(cx.tcx, param_env)
747+
.normalize_internal(cx.tcx, param_env)
748+
.try_to_target_usize(cx.tcx)
747749
.ok_or(Error::TooGeneric);
748750
if size == Ok(0) {
749751
return Ok(ExpectationRange::top());

0 commit comments

Comments
 (0)