---

yaml
---
r: 227640
b: refs/heads/try
c: 8c5572f
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: d4c37088ca873a23e58d512d9418f59056477226
+refs/heads/try: 8c5572fc2114fa2e8156c89cda89c799c9c3e9e0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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