Test fixes and rebase conflicts

Author: alexcrichton

src/bootstrap/bootstrap.py

@@ -296,7 +296,7 @@ def get_toml(self, key):
 
     def get_mk(self, key):
         for line in iter(self.config_mk.splitlines()):
-            if line.startswith(key + ' :='):
+            if line.startswith(key + ' '):
                 var = line[line.find(':=') + 2:].strip()
                 if var != '':
                     return var

src/bootstrap/native.rs

@@ -58,7 +58,7 @@ pub fn llvm(build: &Build, target: &str) {
         }
     }
     if build.config.llvm_clean_rebuild {
-        t!(fs::remove_dir_all(&out_dir));
+        drop(fs::remove_dir_all(&out_dir));
     }
 
     println!("Building LLVM for {}", target);

src/libsyntax/parse/parser.rs

@@ -3731,7 +3731,7 @@ impl<'a> Parser<'a> {
         !self.restrictions.contains(Restrictions::RESTRICTION_NO_STRUCT_LITERAL)
     }
 
-    fn is_union_item(&mut self) -> bool {
+    fn is_union_item(&self) -> bool {
         self.token.is_keyword(keywords::Union) &&
         self.look_ahead(1, |t| t.is_ident() && !t.is_any_keyword())
     }