---

yaml
---
r: 211341
b: refs/heads/tmp
c: 35d979d
h: refs/heads/master
i:
  211339: b624dfe
v: v3

Author: Nick Hamann

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 2d00dc3b85aaf81caa3a4e5764c5e185a4dd0a7c
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: d50fa7eff56e6d2b4daae4cf835dc8133b235c35
+refs/heads/tmp: 35d979d8f8bb63b6063e30954c7c71ddf863b380
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 704c2ee730d2e948d11a2edd77e3f35de8329a6e
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/librustc_typeck/diagnostics.rs

@@ -65,40 +65,27 @@ impl Foo for Bar {
 "##,
 
 E0053: r##"
-For any given method of a trait, the mutabilities of the parameters must match
-between the trait definition and the implementation.
+The parameters of any trait method must match between a trait implementation
+and the trait definition.
 
-Here's an example where the mutability of the `self` parameter is wrong:
+Here are a couple examples of this error:
 
 ```
-trait Foo { fn foo(&self); }
-
-struct Bar;
-
-impl Foo for Bar {
-    // error, the signature should be `fn foo(&self)` instead
-    fn foo(&mut self) { }
+trait Foo {
+    fn foo(x: u16);
+    fn bar(&self);
 }
 
-fn main() {}
-```
-
-Here's another example, this time for a non-`self` parameter:
-
-```
-trait Foo { fn foo(x: &mut bool) -> bool; }
-
 struct Bar;
 
 impl Foo for Bar {
-    // error, the type of `x` should be `&mut bool` instead
-    fn foo(x: &bool) -> bool { *x }
-}
+    // error, expected u16, found i16
+    fn foo(x: i16) { }
 
-fn main() {}
+    // error, values differ in mutability
+    fn foo(&mut self) { }
+}
 ```
-
-
 "##,
 
 E0054: r##"