More test fixes and rebase conflicts

Author: alexcrichton

src/librustc/diagnostics.rs

@@ -78,7 +78,6 @@ register_diagnostics! {
     E0139,
     E0152,
     E0153,
-    E0154,
     E0157,
     E0158,
     E0161,

src/librustc_resolve/diagnostics.rs

@@ -11,6 +11,7 @@
 #![allow(non_snake_case)]
 
 register_diagnostics! {
+    E0154,
     E0157,
     E0153,
     E0251, // a named type or value has already been imported in this module

src/libstd/io/mem.rs

@@ -350,7 +350,7 @@ impl<'a> Reader for BufReader<'a> {
         let write_len = min(buf.len(), self.buf.len() - self.pos);
         {
             let input = &self.buf[self.pos.. self.pos + write_len];
-            let output = &mut buf.slice_to_mut[..write_len];
+            let output = &mut buf[..write_len];
             assert_eq!(input.len(), output.len());
             slice::bytes::copy_memory(output, input);
         }

src/libsyntax/parse/lexer/mod.rs

@@ -271,7 +271,7 @@ impl<'a> StringReader<'a> {
     fn with_str_from_to<T, F>(&self, start: BytePos, end: BytePos, f: F) -> T where
         F: FnOnce(&str) -> T,
     {
-        f(self.filemap.src[
+        f(&self.filemap.src[
                 self.byte_offset(start).to_usize()..
                 self.byte_offset(end).to_usize()])
     }