Use clearer name for integer bit width helper function

diff --git a/src/librustc_mir/build/expr/as_rvalue.rs b/src/librustc_mir/build/expr/as_rvalue.rs
index 59f44fa9229a925c2707d3829e06c909f0863450..1a9064aab1b2f25e050f47ab333dff292fc17871 100644 (file)
--- a/src/librustc_mir/build/expr/as_rvalue.rs
+++ b/src/librustc_mir/build/expr/as_rvalue.rs
@@ -381,7 +381,7 @@ pub fn build_binary_op(&mut self, mut block: BasicBlock,
 
     // Helper to get a `-1` value of the appropriate type
     fn neg_1_literal(&mut self, span: Span, ty: Ty<'tcx>) -> Operand<'tcx> {
-        let bits = self.hir.type_bit_size(ty);
+        let bits = self.hir.integer_bit_width(ty);
         let n = (!0u128) >> (128 - bits);
         let literal = Literal::Value {
             value: self.hir.tcx().mk_const(ty::Const {
@@ -396,7 +396,7 @@ fn neg_1_literal(&mut self, span: Span, ty: Ty<'tcx>) -> Operand<'tcx> {
     // Helper to get the minimum value of the appropriate type
     fn minval_literal(&mut self, span: Span, ty: Ty<'tcx>) -> Operand<'tcx> {
         assert!(ty.is_signed());
-        let bits = self.hir.type_bit_size(ty);
+        let bits = self.hir.integer_bit_width(ty);
         let n = 1 << (bits - 1);
         let literal = Literal::Value {
             value: self.hir.tcx().mk_const(ty::Const {

diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs
index 57aa7bd4afeef178d4749d5741d9a0ded05ba2f9..d8d5f5073abc1d4828490e766ef7b9ffb9717a81 100644 (file)
--- a/src/librustc_mir/hair/cx/mod.rs
+++ b/src/librustc_mir/hair/cx/mod.rs
@@ -149,7 +149,7 @@ pub fn false_literal(&mut self) -> Literal<'tcx> {
         }
     }
 
-    pub fn type_bit_size(
+    pub fn integer_bit_width(
         &self,
         ty: Ty,
     ) -> u64 {
@@ -179,7 +179,7 @@ pub fn const_eval_literal(
         };
 
         let clamp = |n| {
-            let size = self.type_bit_size(ty);
+            let size = self.integer_bit_width(ty);
             trace!("clamp {} with size {} and amt {}", n, size, 128 - size);
             let amt = 128 - size;
             let result = (n << amt) >> amt;