---

yaml
---
r: 217943
b: refs/heads/master
c: 5460650
h: refs/heads/master
i:
  217941: 8caa93b
  217939: d46b7b1
  217935: 53c41ff
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d72c3076e1f5099923bdd54f6ab726d796cd8907
+refs/heads/master: 5460650eeccb0d8925b36480d0ccd7db31a757d8
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc/diagnostics.rs

@@ -411,42 +411,6 @@ fn main() {
 See also https://doc.rust-lang.org/book/unsafe.html
 "##,
 
-E0134: r##"
-You tried to modify the str type, which isn't allowed. Erroneous code
-example:
-
-```
-let s = "salut";
-let c = &mut s[0..1]; // error: modification of string types is not
-                      //        allowed
-```
-
-I you want to modify an str, please use the String type. Example:
-
-```
-let mut s = "salut";
-let mut c = s[0..1].to_owned(); // ok!
-```
-"##,
-
-E0135: r##"
-You tried to modify the str type, which isn't allowed. Erroneous code
-example:
-
-```
-let s = "salut";
-let c = &mut (*s)[0..1]; // error: modification of string types is not
-                         //        allowed
-```
-
-If you want to modify an str, please use the String type. Example:
-
-```
-let mut s = "salut";
-let mut c = s[0..1].to_owned(); // ok!
-```
-"##,
-
 E0137: r##"
 This error indicates that the compiler found multiple functions with the
 `#[main]` attribute. This is an error because there must be a unique entry

trunk/src/librustc_typeck/diagnostics.rs

@@ -1369,23 +1369,30 @@ struct Foo {
 "##,
 
 E0128: r##"
-You declared a type parameter with a default which has the same identifier as
-the type parameter. Erroneous code example:
+Type parameter defaults can only use parameters that occur before them.
+Erroneous code example:
 
 ```
-pub struct Foo<SomeType=SomeType>;
+pub struct Foo<T=U, U=()> {
+    field1: T,
+    filed2: U,
+}
 // error: type parameters with a default cannot use forward declared
 // identifiers
 ```
 
-Please verify that a name clash hasn't been accidentally introduced, and rename
-the type parameter if so. Example:
+Since type parameters are evaluated in-order, you may be able to fix this issue
+by doing:
 
 ```
-pub struct Foo<T=SomeType> {
-    value: T
+pub struct Foo<U=(), T=U> {
+    field1: T,
+    filed2: U,
 }
 ```
+
+Please also verify that this wasn't because of a name-clash and rename the type
+parameter if so.
 "##,
 
 E0130: r##"