---

yaml
---
r: 220963
b: refs/heads/auto
c: cd385cb
h: refs/heads/master
i:
  220961: 18fdb42
  220959: 528556e
v: v3

Author: GuillaumeGomez

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0eb7303c7062792049c0ec4ff2c42565db6d60ff
+refs/heads/auto: cd385cbe34d8a9bad2a6d03c1ef50dd04642a379
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_resolve/diagnostics.rs

@@ -282,10 +282,41 @@ fn foo<T, T>(s: T, u: T) {} // error: the name `T` is already used for a type
                             //        parameter in this type parameter list
 ```
 
-Please verify you didn't mispell the type parameters. Example:
+Please verify that none of the type params are misspelled, and rename any
+clashing parameters. Example:
 
 ```
-fn foo<T, Y>(s: T, u: Y) {}
+fn foo<T, Y>(s: T, u: Y) {} // ok!
+```
+"##,
+
+E0405: r##"
+You tried to implement an undefined trait on an object. Example of
+erroneous code:
+
+```
+struct Foo;
+
+impl SomeTrait for Foo {} // error: use of undeclared trait name `SomeTrait`
+```
+
+Please verify that the name of the trait wasn't misspelled and ensure that it
+was imported. Example:
+
+```
+// solution 1:
+use some_file::SomeTrait;
+
+// solution 2:
+trait SomeTrait {
+    // some functions
+}
+
+struct Foo;
+
+impl SomeTrait for Foo { // ok!
+    // implements functions
+}
 ```
 "##
 
@@ -300,7 +331,6 @@ register_diagnostics! {
     E0401, // can't use type parameters from outer function
     E0402, // cannot use an outer type parameter in this context
     E0404, // is not a trait
-    E0405, // use of undeclared trait name
     E0406, // undeclared associated type
     E0407, // method is not a member of trait
     E0408, // variable from pattern #1 is not bound in pattern #