---

yaml
---
r: 225978
b: refs/heads/stable
c: 8c5572f
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: d4c37088ca873a23e58d512d9418f59056477226
+refs/heads/stable: 8c5572fc2114fa2e8156c89cda89c799c9c3e9e0
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/librustc_typeck/diagnostics.rs

@@ -212,8 +212,8 @@ http://doc.rust-lang.org/reference.html#trait-objects
 "##,
 
 E0034: r##"
-The compiler doesn't know what method to call because more than one does
-have the same prototype. Example:
+The compiler doesn't know what method to call because more than one method
+has the same prototype. Example:
 
 ```
 struct Test;
@@ -230,7 +230,7 @@ impl Trait1 for Test { fn foo() {} }
 impl Trait2 for Test { fn foo() {} }
 
 fn main() {
-    Test::foo() // error, what foo() to call?
+    Test::foo() // error, which foo() to call?
 }
 ```
 
@@ -250,6 +250,28 @@ fn main() {
     Test::foo() // and now that's good!
 }
 ```
+
+However, a better solution would be using fully explicit naming of type and
+trait:
+
+```
+struct Test;
+
+trait Trait1 {
+    fn foo();
+}
+
+trait Trait2 {
+    fn foo();
+}
+
+impl Trait1 for Test { fn foo() {} }
+impl Trait2 for Test { fn foo() {} }
+
+fn main() {
+    <Test as Trait1>::foo()
+}
+```
 "##,
 
 E0035: r##"