diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2020-07-11 09:28:10 +0200 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2020-07-15 19:21:15 +0200 |
| commit | 5c0e172f919e09e8d37dfa98e9b29855282cb672 (patch) | |
| tree | 3748d3ea4b98040fc5c06808031d511176d31dec /src | |
| parent | a871fedf98ee004c3d7b85ab5ce5f28a0347263c (diff) | |
| download | rust-5c0e172f919e09e8d37dfa98e9b29855282cb672.tar.gz rust-5c0e172f919e09e8d37dfa98e9b29855282cb672.zip | |
s/try_to_usize/try_to_machine_usize/
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_middle/mir/interpret/value.rs | 2 | ||||
| -rw-r--r-- | src/librustc_middle/ty/sty.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_middle/mir/interpret/value.rs b/src/librustc_middle/mir/interpret/value.rs index ce47c2e6282..ba2a2bd8a02 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<u64> { + pub fn try_to_machine_usize(&self, tcx: TyCtxt<'tcx>) -> Option<u64> { 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 b921ad66514..930bdd168b7 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<u64> { - 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<u64> { - self.try_to_value()?.try_to_usize(tcx) + pub fn try_to_machine_usize(self, tcx: TyCtxt<'tcx>) -> Option<u64> { + self.try_to_value()?.try_to_machine_usize(tcx) } } |