---

yaml
---
r: 235881
b: refs/heads/stable
c: 0efc7f1
h: refs/heads/master
i:
  235879: ce85169
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 8a75dcdadfe8c3657c5a6f085a984e1c97b48910
+refs/heads/stable: 0efc7f143f7659ca025d555d4f9ca373320e72c4
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_resolve/diagnostics.rs

@@ -410,9 +410,10 @@ match 0 {
 }
 ```
 
-Compiler needs to know the pattern value at compile's time, which is
-not possible with a `static` variable. So please verify you didn't
-misspell the variable's name or use a `const` instead. Example:
+The compiler needs to know the value of the pattern at compile time,
+which is not possible with a `static` variable. Please verify that the
+variable is spelled correctly and if so, try to use a `const` instead.
+Example:
 
 ```
 const FOO : i32 = 0;
@@ -425,7 +426,7 @@ match 0 {
 "##,
 
 E0424: r##"
-`self` keyword was used in a static method. Example of erroneous code:
+The `self` keyword was used in a static method. Example of erroneous code:
 
 ```
 struct Foo;
@@ -439,8 +440,9 @@ impl Foo {
 }
 ```
 
-Please verify you didn't forget to add `self` in your method's argument
-list if your intention wasn't to create a static method. Example:
+Please check if the method's argument list should have contained self,
+&self, or &mut self (in case you didn't want to create a static method),
+and add it if so. Example:
 
 ```
 struct Foo;
@@ -453,18 +455,6 @@ impl Foo {
     }
 }
 ```
-
-Or please verify you didn't misspell the variable's name:
-
-```
-struct Foo;
-
-impl Foo {
-    fn foo(sel: i32) {
-        println!("{}", sel); // ok!
-    }
-}
-```
 "##,
 
 E0428: r##"