---

yaml
---
r: 232649
b: refs/heads/try
c: 1ac7633
h: refs/heads/master
i:
  232647: bda57d8
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 6715ec8da01816f1b3d0a0e47c88ff47d1559b4f
+refs/heads/try: 1ac7633c8af439828f16a5bb09162f5475d5a6de
 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

@@ -2423,7 +2423,7 @@ E0323: r##"
 An associated const was implemented when another trait item was expected.
 Erroneous code example:
 
-```Rust
+```
 trait Foo {
     type N;
 }
@@ -2440,7 +2440,7 @@ impl Foo for Bar {
 To fix this error, please check you didn't misspell the associated const
 name or you did implement the good trait item. Example:
 
-```Rust
+```
 struct Bar;
 
 trait Foo {
@@ -2462,6 +2462,45 @@ impl Foo for Bar {
 ```
 "##,
 
+E0324: r##"
+A method was implemented when another trait item was expected. Erroneous
+code example:
+
+```
+struct Bar;
+
+trait Foo {
+    const N : u32;
+
+    fn M();
+}
+
+impl Foo for Bar {
+    fn N() {}
+    // error: item `N` is an associated method, which doesn't match its
+    //        trait `<Bar as Foo>`
+}
+```
+
+To fix this error, please check you didn't misspell the method name. Example:
+
+```
+struct Bar;
+
+trait Foo {
+    const N : u32;
+    
+    fn M();
+}
+
+impl Foo for Bar {
+    const N : u32 = 0;
+
+    fn M() {} // ok!
+}
+```
+"##,
+
 E0326: r##"
 The types of any associated constants in a trait implementation must match the
 types in the trait definition. This error indicates that there was a mismatch.