---

yaml
---
r: 228202
b: refs/heads/try
c: 6f01aa0
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: c01c1fd715bc2a61a250d53f8bc50299078c010c
+refs/heads/try: 6f01aa0fc8c7d74fb51e20444d9c51ce707a1de4
 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

@@ -1563,7 +1563,7 @@ type Foo = Trait; // error: the value of the associated type `Bar` (from
                   //        the trait `Trait`) must be specified
 ```
 
-Please verify you specified all associated types of the trait or that you
+Please verify you specified all associated types of the trait and that you
 used the right trait. Example:
 
 ```
@@ -1869,7 +1869,7 @@ type Foo = Trait<F=i32>; // error: associated type `F` not found for
                          //        `Trait`
 ```
 
-Please verify you used the good trait or you didn't mispelled the
+Please verify you used the right trait or you didn't misspell the
 associated type name. Example:
 
 ```
@@ -1881,6 +1881,22 @@ type Foo = Trait<Bar=i32>; // ok!
 ```
 "##,
 
+E0232: r##"
+The attribute must have a value. Erroneous code example:
+
+```
+#[rustc_on_unimplemented] // error: this attribute must have a value
+trait Bar {}
+```
+
+Please supply the missing value of the attribute. Example:
+
+```
+#[rustc_on_unimplemented = "foo"] // ok!
+trait Bar {}
+```
+"##,
+
 E0243: r##"
 This error indicates that not enough type parameters were found in a type or
 trait.
@@ -2153,7 +2169,6 @@ register_diagnostics! {
     E0229, // associated type bindings are not allowed here
     E0230, // there is no type parameter on trait
     E0231, // only named substitution parameters are allowed
-    E0232, // this attribute must have a value
     E0233,
     E0234,
     E0235, // structure constructor specifies a structure of type but