about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2016-04-28 15:12:52 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2016-05-16 09:13:42 +0200
commitcd81b60a4aa45f0eb72c5170673f24dc1a1c3592 (patch)
treeaa12b9b77bf9bb89ef4e645767d285f2fbd428b3 /src
parente90307d2a214614ca55ce31371c0768d7bffa114 (diff)
downloadrust-cd81b60a4aa45f0eb72c5170673f24dc1a1c3592.tar.gz
rust-cd81b60a4aa45f0eb72c5170673f24dc1a1c3592.zip
fix bug in `debug!` output from `rustc::middle::dataflow`
(bug was cut/pasted into `rustc_borrowck::bitslice`, so I fixed it
there as well.)
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/dataflow.rs4
-rw-r--r--src/librustc_borrowck/bitslice.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs
index 41b27a48b29..4d01b59001c 100644
--- a/src/librustc/middle/dataflow.rs
+++ b/src/librustc/middle/dataflow.rs
@@ -660,8 +660,8 @@ fn set_bit(words: &mut [usize], bit: usize) -> bool {
 }
 
 fn bit_str(bit: usize) -> String {
-    let byte = bit >> 8;
-    let lobits = 1 << (bit & 0xFF);
+    let byte = bit >> 3;
+    let lobits = 1 << (bit & 0b111);
     format!("[{}:{}-{:02x}]", bit, byte, lobits)
 }
 
diff --git a/src/librustc_borrowck/bitslice.rs b/src/librustc_borrowck/bitslice.rs
index a4aa7ae1574..0454b0f3e7c 100644
--- a/src/librustc_borrowck/bitslice.rs
+++ b/src/librustc_borrowck/bitslice.rs
@@ -73,8 +73,8 @@ fn bit_lookup(bit: usize) -> BitLookup {
 
 
 fn bit_str(bit: usize) -> String {
-    let byte = bit >> 8;
-    let lobits = 1 << (bit & 0xFF);
+    let byte = bit >> 3;
+    let lobits = 1 << (bit & 0b111);
     format!("[{}:{}-{:02x}]", bit, byte, lobits)
 }