Follow some of clippy's suggestions

protocol/src/format.rs

@@ -171,8 +171,8 @@ impl fmt::Display for Color {
 }
 
 impl Color {
-    fn from_string(val: &String) -> Self {
-        match val.as_ref() {
+    fn from_string(val: &str) -> Self {
+        match val {
             "black" => Color::Black,
             "dark_blue" => Color::DarkBlue,
             "dark_green" => Color::DarkGreen,
@@ -188,7 +188,6 @@ impl Color {
             "red" => Color::Red,
             "light_purple" => Color::LightPurple,
             "yellow" => Color::Yellow,
-            "white" => Color::White,
             val if val.len() == 7 && val.as_bytes()[0] == b'#' => {
                 let r = match u8::from_str_radix(&val[1..3], 16) {
                     Ok(r) => r,
@@ -204,7 +203,7 @@ impl Color {
                 };
                 Color::RGB(r, g, b)
             }
-            _ => Color::White,
+            "white" | _ => Color::White,
         }
     }
 

protocol/src/nbt/mod.rs

@@ -273,7 +273,7 @@ impl Serializable for Tag {
     }
 }
 
-pub fn write_string(buf: &mut io::Write, s: &String) -> io::Result<()> {
+pub fn write_string(buf: &mut io::Write, s: &str) -> io::Result<()> {
     let data = s.as_bytes();
     try!((data.len() as i16).write_to(buf));
     buf.write_all(data)

protocol/src/types/bit/map.rs

@@ -95,11 +95,11 @@ impl Map {
         let mask = (1 << self.bit_size) - 1;
         let ii = i % 64;
         let pos2 = (i + self.bit_size - 1) / 64;
-        if pos2 != pos {
+        if pos2 == pos {
+            ((self.bits[pos] >> ii) & mask) as usize
+        } else {
             let used = 64 - ii;
             (((self.bits[pos] >> ii) | (self.bits[pos2] << used)) & mask) as usize
-        } else {
-            ((self.bits[pos] >> ii) & mask) as usize
         }
     }
 }