---

yaml
---
r: 182574
b: refs/heads/beta
c: ecbee2e
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: df1cddf20a2a4ece854e5d8592ad3155a3313fd2
+refs/heads/beta: ecbee2e56824161fcc0decd087055d13e0876058
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/src/librustc/diagnostics.rs

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

branches/beta/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

branches/beta/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);
         }

branches/beta/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()])
     }