---

yaml
---
r: 228810
b: refs/heads/try
c: 0efc7f1
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 8a75dcdadfe8c3657c5a6f085a984e1c97b48910
+refs/heads/try: 0efc7f143f7659ca025d555d4f9ca373320e72c4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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##"