---

yaml
---
r: 233652
b: refs/heads/beta
c: 5650709
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 73b369d7ab5999eaebeff402edd1b2405b766a4a
+refs/heads/beta: 565070948f8b2aff522d522b7a4be65790570b41
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -2482,7 +2482,8 @@ impl Foo for Bar {
 }
 ```
 
-To fix this error, please verify you didn't misspell the method name. Example:
+To fix this error, please verify that the method name wasn't misspelled and
+verify that you are indeed implementing the correct trait items. Example:
 
 ```
 struct Bar;
@@ -2519,9 +2520,8 @@ impl Foo for Bar {
 }
 ```
 
-To fix this error, please verify you didn't misspell the associated type name
-and that your trait item implementation corresponds to the trait definition.
-Example:
+Please verify that the associated type name wasn't misspelled and your
+implementation corresponds to the trait definition. Example:
 
 ```
 struct Bar;
@@ -2722,8 +2722,8 @@ let x = 12f32; // error: binary operation `<<` cannot be applied to
 x << 2;
 ```
 
-To fix this error, please check this type implements this binary operation.
-Example:
+To fix this error, please check that this type implements this binary
+operation. Example:
 
 ```
 let x = 12u32; // the `u32` type does implement it:
@@ -2775,7 +2775,8 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
 "##,
 
 E0390: r##"
-You tried to implement on an `*mut T` type. Erroneous code example:
+You tried to implement methods for a mutable raw pointer (*mut T). Erroneous
+code example:
 
 ```
 struct Foo {
@@ -2787,7 +2788,12 @@ impl *mut Foo {}
 //        `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive
 ```
 
-To fix this, please follow the compiler recommendations.
+This isn't allowed, perhaps you might get the desired effects by wrapping the
+raw pointer in a struct. Example:
+
+```
+struct FooPtr(pub *mut Foo);
+```
 "##,
 
 E0391: r##"