diff --git a/src/librustc_middle/mir/interpret/value.rs b/src/librustc_middle/mir/interpret/value.rs index ce47c2e62826..ba2a2bd8a026 100644 --- a/src/librustc_middle/mir/interpret/value.rs +++ b/src/librustc_middle/mir/interpret/value.rs @@ -68,7 +68,7 @@ impl<'tcx> ConstValue<'tcx> { } } - pub fn try_to_usize(&self, tcx: TyCtxt<'tcx>) -> Option { + pub fn try_to_machine_usize(&self, tcx: TyCtxt<'tcx>) -> Option { Some(self.try_to_bits(tcx.data_layout.pointer_size)? as u64) } diff --git a/src/librustc_middle/ty/sty.rs b/src/librustc_middle/ty/sty.rs index b921ad665147..930bdd168b78 100644 --- a/src/librustc_middle/ty/sty.rs +++ b/src/librustc_middle/ty/sty.rs @@ -2423,7 +2423,7 @@ impl<'tcx> Const<'tcx> { #[inline] pub fn try_eval_usize(&self, tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>) -> Option { - self.val.eval(tcx, param_env).try_to_usize(tcx) + self.val.eval(tcx, param_env).try_to_machine_usize(tcx) } #[inline] @@ -2494,8 +2494,8 @@ impl<'tcx> ConstKind<'tcx> { } #[inline] - pub fn try_to_usize(self, tcx: TyCtxt<'tcx>) -> Option { - self.try_to_value()?.try_to_usize(tcx) + pub fn try_to_machine_usize(self, tcx: TyCtxt<'tcx>) -> Option { + self.try_to_value()?.try_to_machine_usize(tcx) } }