---

yaml
---
r: 220795
b: refs/heads/master
c: 9581154
h: refs/heads/master
i:
  220793: c06453e
  220791: b1372b7
v: v3

Author: GuillaumeGomez

[refs]

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

trunk/src/librustc_resolve/diagnostics.rs

@@ -317,8 +317,7 @@ impl Foo for Bar { // ok!
 "##,
 
 E0405: r##"
-You tried to implement an undefined trait on an object. Example of
-erroneous code:
+A non-trait was implemented. Example of erroneous code:
 
 ```
 struct Foo;
@@ -344,7 +343,42 @@ impl SomeTrait for Foo { // ok!
     // implements functions
 }
 ```
-"##
+"##,
+
+E0407: r##"
+A definition of a method not in the implemented trait was given. Example of
+erroneous code:
+
+```
+trait Foo {
+    fn a();
+}
+
+struct Bar;
+
+impl Foo for Bar {
+    fn a() {}
+    fn b() {} // error: method `b` is not a member of trait `Foo`
+}
+```
+
+Please verify you didn't mispelled the method name and you used the good
+trait. Example:
+
+```
+trait Foo {
+    fn a();
+    fn b();
+}
+
+struct Bar;
+
+impl Foo for Bar {
+    fn a() {}
+    fn b() {} // ok!
+}
+```
+"##,
 
 }
 
@@ -357,7 +391,6 @@ register_diagnostics! {
     E0401, // can't use type parameters from outer function
     E0402, // cannot use an outer type parameter in this context
     E0406, // undeclared associated type
-    E0407, // method is not a member of trait
     E0408, // variable from pattern #1 is not bound in pattern #
     E0409, // variable is bound with different mode in pattern # than in
            // pattern #1