about summary refs log tree commit diff
path: root/src/librustc_mir/interpret
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2018-05-31 19:21:34 +0200
committerLinus Färnstrand <faern@faern.net>2018-05-31 19:21:34 +0200
commit8939fe60a1980dc097da19e6de32df51c18944bb (patch)
tree1f2d824c2cb89ea36e71bd5bf7802f94a996a875 /src/librustc_mir/interpret
parent0d7d5e994fca984a71303b170acc24cfbd26474a (diff)
downloadrust-8939fe60a1980dc097da19e6de32df51c18944bb.tar.gz
rust-8939fe60a1980dc097da19e6de32df51c18944bb.zip
Rename bytes -> bits
Diffstat (limited to 'src/librustc_mir/interpret')
-rw-r--r--src/librustc_mir/interpret/const_eval.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustc_mir/interpret/const_eval.rs b/src/librustc_mir/interpret/const_eval.rs
index baaca5f8307..49ad134e593 100644
--- a/src/librustc_mir/interpret/const_eval.rs
+++ b/src/librustc_mir/interpret/const_eval.rs
@@ -593,20 +593,20 @@ pub fn const_eval_provider<'a, 'tcx>(
 
 fn numeric_intrinsic<'tcx>(
     name: &str,
-    bytes: u128,
+    bits: u128,
     kind: Primitive,
 ) -> EvalResult<'tcx, Scalar> {
     let defined = match kind {
         Primitive::Int(integer, _) => integer.size().bits() as u8,
-        _ => bug!("invalid `{}` argument: {:?}", name, bytes),
+        _ => bug!("invalid `{}` argument: {:?}", name, bits),
     };
     let extra = 128 - defined as u128;
-    let bytes_out = match name {
-        "ctpop" => bytes.count_ones() as u128,
-        "ctlz" => bytes.leading_zeros() as u128 - extra,
-        "cttz" => (bytes << extra).trailing_zeros() as u128 - extra,
-        "bswap" => (bytes << extra).swap_bytes(),
+    let bits_out = match name {
+        "ctpop" => bits.count_ones() as u128,
+        "ctlz" => bits.leading_zeros() as u128 - extra,
+        "cttz" => (bits << extra).trailing_zeros() as u128 - extra,
+        "bswap" => (bits << extra).swap_bytes(),
         _ => bug!("not a numeric intrinsic: {}", name),
     };
-    Ok(Scalar::Bits { bits: bytes_out, defined })
+    Ok(Scalar::Bits { bits: bits_out, defined })
 }