---

yaml
---
r: 217514
b: refs/heads/tmp
c: 14e3d26
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: 2ad26e850ed5dfedda8c96d7315aee50145ceedd
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: d73cc565656c76cb5270934caaafa78760cc565b
+refs/heads/tmp: 14e3d26b8a19c56c2c2b2b99ee870a9002bb70e0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc/diagnostics.rs

@@ -361,13 +361,31 @@ http://doc.rust-lang.org/reference.html#ffi-attributes
 "##,
 
 E0109: r##"
-You tried to give type parameter to a type which doesn't need it. Erroneous
+You tried to give    type parameter to a type which doesn't need it. Erroneous
 code example:
 
 ```
 type X = u32<i32>; // error: type parameters are not allowed on this type
 ```
 
+Please check that you used the correct type and recheck its definition. Perhaps
+it doesn't need the type parameter.
+Example:
+
+```
+type X = u32; // ok!
+```
+"##,
+
+E0110: r##"
+You tried to give a lifetime parameter to a type which doesn't need it.
+Erroneous code example:
+
+```
+type X = u32<'static>; // error: lifetime parameters are not allowed on
+                       //        this type
+```
+
 Please check you actually used the good type or check again its definition.
 Example:
 
@@ -1071,7 +1089,6 @@ register_diagnostics! {
     E0017,
     E0022,
     E0038,
-    E0110,
     E0134,
     E0135,
     E0136,

branches/tmp/src/librustc_typeck/diagnostics.rs

@@ -1010,12 +1010,15 @@ example:
 
 ```
 type Foo<T> = u32; // error: type parameter `T` is unused
+// or:
+type Foo<A,B> = Box<A>; // error: type parameter `B` is unused
 ```
 
 Please check you didn't write too many type parameters. Example:
 
 ```
 type Foo = u32; // ok!
+type Foo<A> = Box<A>; // ok!
 ```
 "##,