---

yaml
---
r: 221162
b: refs/heads/tmp
c: bc79f20
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: cd385cbe34d8a9bad2a6d03c1ef50dd04642a379
+refs/heads/tmp: bc79f20ccac4ead82fae1464ea0916e78e04616f
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e58601ab085591c71a27ae82137fc313222c2270
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_resolve/diagnostics.rs

@@ -290,6 +290,32 @@ fn foo<T, Y>(s: T, u: Y) {} // ok!
 ```
 "##,
 
+E0404: r##"
+You tried to implement a non-trait object on an object. Example of erroneous
+code:
+
+```
+struct Foo;
+struct Bar;
+
+impl Foo for Bar {} // error: `Foo` is not a trait
+```
+
+Please verify you didn't mispelled the trait's name or used the wrong object.
+Example:
+
+```
+trait Foo {
+    // some functions
+}
+struct Bar;
+
+impl Foo for Bar { // ok!
+    // functions implementation
+}
+```
+"##,
+
 E0405: r##"
 You tried to implement an undefined trait on an object. Example of
 erroneous code:
@@ -330,7 +356,6 @@ register_diagnostics! {
     E0258,
     E0401, // can't use type parameters from outer function
     E0402, // cannot use an outer type parameter in this context
-    E0404, // is not a trait
     E0406, // undeclared associated type
     E0407, // method is not a member of trait
     E0408, // variable from pattern #1 is not bound in pattern #