rollup merge of rust-lang#18476 : vadimcn/17982

alexcrichton · Nov 3, 2014 · 68e7dd0 · 68e7dd0
2 parents 6478fcf + e23f5c8
commit 68e7dd0
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/libterm/win.rs b/src/libterm/win.rs
@@ -71,8 +71,7 @@ fn color_to_bits(color: color::Color) -> u16 {
 }
 
 fn bits_to_color(bits: u16) -> color::Color {
-    let bits = bits & 0x7;
-    let color = match bits {
+    let color = match bits & 0x7 {
         0 => color::BLACK,
         0x1 => color::BLUE,
         0x2 => color::GREEN,
@@ -84,11 +83,7 @@ fn bits_to_color(bits: u16) -> color::Color {
         _ => unreachable!()
     };
 
-    if bits >= 8 {
-        color | 0x8
-    } else {
-        color
-    }
+    color | (bits & 0x8) // copy the hi-intensity bit
 }
 
 impl<T: Writer+Send> WinConsole<T> {