rollup merge of #18327 : vadimcn/17982

alexcrichton · alexcrichton · commit ed7f4a8da4f6 · 2014-10-27T15:12:30.000-07:00
diff --git a/src/libterm/win.rs b/src/libterm/win.rs
@@ -71,7 +71,8 @@ fn color_to_bits(color: color::Color) -> u16 {
 }
 
 fn bits_to_color(bits: u16) -> color::Color {
-    let color = match bits & 0x7 {
+    let bits = bits & 0x7;
+    let color = match bits {
         0 => color::BLACK,
         0x1 => color::BLUE,
         0x2 => color::GREEN,

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ fn color_to_bits(color: color::Color) -> u16 {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`fn bits_to_color(bits: u16) -> color::Color {`
`74`		`- let color = match bits & 0x7 {`
	`74`	`+ let bits = bits & 0x7;`
	`75`	`+ let color = match bits {`
`75`	`76`	`0 => color::BLACK,`
`76`	`77`	`0x1 => color::BLUE,`
`77`	`78`	`0x2 => color::GREEN,`