Merging error code descriptions into E0107 and adding "no longer

emitted" messages to the others.

Author: Matthew Russo

src/librustc_typeck/diagnostics.rs

@@ -1041,6 +1041,7 @@ enum NightsWatch {}
 "##,
 
 E0087: r##"
+#### Note: this error code is no longer emitted by the compiler.
 Too many type arguments were supplied for a function. For example:
 
 ```compile_fail,E0087
@@ -1057,6 +1058,7 @@ parameters.
 "##,
 
 E0088: r##"
+#### Note: this error code is no longer emitted by the compiler.
 You gave too many lifetime arguments. Erroneous code example:
 
 ```compile_fail,E0088
@@ -1103,6 +1105,7 @@ fn main() {
 "##,
 
 E0089: r##"
+#### Note: this error code is no longer emitted by the compiler.
 Too few type arguments were supplied for a function. For example:
 
 ```compile_fail,E0089
@@ -1129,6 +1132,7 @@ fn main() {
 "##,
 
 E0090: r##"
+#### Note: this error code is no longer emitted by the compiler.
 You gave too few lifetime arguments. Example:
 
 ```compile_fail,E0090
@@ -1258,18 +1262,34 @@ extern "rust-intrinsic" {
 "##,
 
 E0107: r##"
-This error means that an incorrect number of lifetime parameters were provided
-for a type (like a struct or enum) or trait:
+This error means that an incorrect number of generic arguments were provided:
 
 ```compile_fail,E0107
-struct Foo<'a, 'b>(&'a str, &'b str);
-enum Bar { A, B, C }
+struct Foo<T> { x: T }
 
-struct Baz<'a> {
-    foo: Foo<'a>, // error: expected 2, found 1
-    bar: Bar<'a>, // error: expected 0, found 1
+struct Bar { x: Foo }             // error: wrong number of type arguments:
+                                  //        expected 1, found 0
+struct Baz<S, T> { x: Foo<S, T> } // error: wrong number of type arguments:
+                                  //        expected 1, found 2
+
+fn foo<T, U>(x: T, y: U) {}
+
+fn main() {
+    let x: bool = true;
+    foo::<bool>(x);                 // error: wrong number of type arguments:
+                                    //        expected 2, found 1
+    foo::<bool, i32, i32>(x, 2, 4); // error: wrong number of type arguments:
+                                    //        expected 2, found 3
+}
+
+fn f() {}
+
+fn main() {
+    f::<'static>(); // error: wrong number of lifetime arguments:
+                    //        expected 0, found 1
 }
 ```
+
 "##,
 
 E0109: r##"
@@ -2397,6 +2417,7 @@ fn baz<I>(x: &<I as Foo>::A) where I: Foo<A=Bar> {}
 "##,
 
 E0243: r##"
+#### Note: this error code is no longer emitted by the compiler.
 This error indicates that not enough type parameters were found in a type or
 trait.
 
@@ -2411,6 +2432,7 @@ struct Bar { x: Foo }
 "##,
 
 E0244: r##"
+#### Note: this error code is no longer emitted by the compiler.
 This error indicates that too many type parameters were found in a type or
 trait.