Test fixes and rebase conflicts

src/libsyntax/parse/mod.rs

@@ -253,10 +253,8 @@ pub fn file_to_filemap(sess: &ParseSess, path: &Path, spanopt: Option<Span>)
     let bytes = match File::open(path).read_to_end() {
         Ok(bytes) => bytes,
         Err(e) => {
-            let error_msg = e.desc;
             err(&format!("couldn't read {:?}: {}",
-                        path.display(),
-                        error_msg)[]);
+                        path.display(), e)[]);
             unreachable!()
         }
     };