rollup merge of #18327 : vadimcn/17982

This commit is contained in:
Alex Crichton 2014-10-27 09:07:47 -07:00
commit ed7f4a8da4

View File

@ -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,