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.
Rust-for-Linux · Oct 22, 2024 · 6c25def · 6c25def
1 parent 9f5949f
commit 6c25def
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/preempt_count/adjustment.rs b/src/preempt_count/adjustment.rs
@@ -425,7 +425,8 @@ memoize!(
 
             ty::Array(elem_ty, size) => {
                 let size = size
-                    .try_eval_target_usize(cx.tcx, param_env)
+                    .normalize_internal(cx.tcx, param_env)
+                    .try_to_target_usize(cx.tcx)
                     .ok_or(Error::TooGeneric);
                 if size == Ok(0) {
                     return Ok(0);

diff --git a/src/preempt_count/expectation.rs b/src/preempt_count/expectation.rs
@@ -425,7 +425,8 @@ impl<'tcx> AnalysisCtxt<'tcx> {
 
                 let elem_adj = self.drop_adjustment(param_and_elem_ty)?;
                 let size = size
-                    .try_eval_target_usize(self.tcx, param_env)
+                    .normalize_internal(self.tcx, param_env)
+                    .try_to_target_usize(self.tcx)
                     .ok_or(Error::TooGeneric)?;
                 let Ok(size) = i32::try_from(size) else {
                     return Ok(());
@@ -743,7 +744,8 @@ memoize!(
 
             ty::Array(elem_ty, size) => {
                 let size = size
-                    .try_eval_target_usize(cx.tcx, param_env)
+                    .normalize_internal(cx.tcx, param_env)
+                    .try_to_target_usize(cx.tcx)
                     .ok_or(Error::TooGeneric);
                 if size == Ok(0) {
                     return Ok(ExpectationRange::top());