---

yaml
---
r: 233884
b: refs/heads/beta
c: 954d6ae
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: c016da248f30a9356c967e18b2721ca80d8694de
+refs/heads/beta: 954d6ae184b97b5b7a4327d73c277725807450ae
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_resolve/diagnostics.rs

@@ -406,8 +406,20 @@ example:
 ```
 
 The `Self` keyword represents the current type, which explains why it
-can only be used inside an impl or a trait. For example, it is used
-to solve conflicts like this one:
+can only be used inside an impl or a trait. It gives access to
+associated items of a type:
+
+```
+trait Foo {
+    type Bar;
+}
+
+trait Baz : Foo {
+    fn bar() -> Self::Bar; // like this
+}
+```
+
+However, be careful when two types has a common associated type:
 
 ```
 trait Foo {
@@ -424,26 +436,14 @@ trait Baz : Foo + Foo2 {
 }
 ```
 
-Which can be solved by specifying from which trait we want to use
-the `Bar` type:
+It can be solved by specifying from which trait we want to use the
+`Bar` type:
 
 ```
 trait Baz : Foo + Foo2 {
     fn bar() -> <Self as Foo>::Bar; // ok!
 }
 ```
-
-A more simple example gives:
-
-```
-trait Foo {
-    type Bar;
-}
-
-trait Baz : Foo {
-    fn bar() -> <Self as Foo>::Bar; // ok!
-}
-```
 "##,
 
 E0412: r##"
@@ -872,8 +872,8 @@ impl Foo for i32 {}
 }
 
 register_diagnostics! {
-    E0153, // called no where
-    E0157, // called from no where
+//  E0153,
+//  E0157,
     E0254, // import conflicts with imported crate in this module
     E0257,
     E0258,