---

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

Author: GuillaumeGomez

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cd385cbe34d8a9bad2a6d03c1ef50dd04642a379
+refs/heads/master: bc79f20ccac4ead82fae1464ea0916e78e04616f
 refs/heads/snap-stage3: d4432b37378ec55450e06799f5344b4b0f4b94e0
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/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 #