Update new ui tests

12 files changed, 54 insertions, 52 deletions

diff --git a/src/test/ui/bad/bad-mid-path-type-params.stderr b/src/test/ui/bad/bad-mid-path-type-params.stderr
index d2b002ebee9..f0998b23c1c 100644
--- a/src/test/ui/bad/bad-mid-path-type-params.stderr
+++ b/src/test/ui/bad/bad-mid-path-type-params.stderr
@@ -1,26 +1,26 @@
-error[E0087]: too many type parameters provided: expected at most 1 type parameter, found 2 type parameters
-  --> $DIR/bad-mid-path-type-params.rs:40:28
+error[E0087]: wrong number of type arguments: expected 1, found 2
+  --> $DIR/bad-mid-path-type-params.rs:40:13
    |
 LL |     let _ = S::new::<isize,f64>(1, 1.0);
-   |                            ^^^ expected 1 type parameter
+   |             ^^^^^^^^^^^^^^^^^^^ unexpected type argument
 
-error[E0107]: wrong number of lifetime parameters: expected 0, found 1
+error[E0107]: wrong number of lifetime arguments: expected 0, found 1
   --> $DIR/bad-mid-path-type-params.rs:43:13
    |
 LL |     let _ = S::<'a,isize>::new::<f64>(1, 1.0);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime parameter
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
-error[E0087]: too many type parameters provided: expected at most 1 type parameter, found 2 type parameters
-  --> $DIR/bad-mid-path-type-params.rs:46:36
+error[E0087]: wrong number of type arguments: expected 1, found 2
+  --> $DIR/bad-mid-path-type-params.rs:46:17
    |
 LL |     let _: S2 = Trait::new::<isize,f64>(1, 1.0);
-   |                                    ^^^ expected 1 type parameter
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^ unexpected type argument
 
-error[E0088]: too many lifetime parameters provided: expected at most 0 lifetime parameters, found 1 lifetime parameter
-  --> $DIR/bad-mid-path-type-params.rs:49:25
+error[E0088]: wrong number of lifetime arguments: expected 0, found 1
+  --> $DIR/bad-mid-path-type-params.rs:49:17
    |
 LL |     let _: S2 = Trait::<'a,isize>::new::<f64>(1, 1.0);
-   |                         ^^ expected 0 lifetime parameters
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/constructor-lifetime-args.stderr b/src/test/ui/constructor-lifetime-args.stderr
index 1710594d255..930d90c70bd 100644
--- a/src/test/ui/constructor-lifetime-args.stderr
+++ b/src/test/ui/constructor-lifetime-args.stderr
@@ -1,26 +1,26 @@
-error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter
+error[E0090]: wrong number of lifetime arguments: expected 2, found 1
   --> $DIR/constructor-lifetime-args.rs:27:5
    |
 LL |     S::<'static>(&0, &0);
-   |     ^^^^^^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^ expected 2 lifetime arguments
 
-error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters
-  --> $DIR/constructor-lifetime-args.rs:29:27
+error[E0088]: wrong number of lifetime arguments: expected 2, found 3
+  --> $DIR/constructor-lifetime-args.rs:29:5
    |
 LL |     S::<'static, 'static, 'static>(&0, &0);
-   |                           ^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
-error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter
+error[E0090]: wrong number of lifetime arguments: expected 2, found 1
   --> $DIR/constructor-lifetime-args.rs:32:5
    |
 LL |     E::V::<'static>(&0);
-   |     ^^^^^^^^^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^^^^ expected 2 lifetime arguments
 
-error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters
-  --> $DIR/constructor-lifetime-args.rs:34:30
+error[E0088]: wrong number of lifetime arguments: expected 2, found 3
+  --> $DIR/constructor-lifetime-args.rs:34:5
    |
 LL |     E::V::<'static, 'static, 'static>(&0);
-   |                              ^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr
index 6b54baefb1d..b614da88ba1 100644
--- a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr
+++ b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr
@@ -2,7 +2,7 @@ error[E0244]: wrong number of type arguments: expected at most 2, found 3
   --> $DIR/generic-impl-more-params-with-defaults.rs:23:5
    |
 LL |     Vec::<isize, Heap, bool>::new();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type arguments
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issue-53251.rs b/src/test/ui/issue-53251.rs
index aa9da744566..8c75ea45a61 100644
--- a/src/test/ui/issue-53251.rs
+++ b/src/test/ui/issue-53251.rs
@@ -19,10 +19,12 @@ macro_rules! impl_add {
         $(
             fn $n() {
                 S::f::<i64>();
-                //~^ ERROR too many type parameters provided
+                //~^ ERROR wrong number of type arguments
             }
         )*
     }
 }
 
 impl_add!(a b);
+
+fn main() {}
diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.stderr b/src/test/ui/methods/method-call-lifetime-args-fail.stderr
index 3814f4b5065..849fa574e12 100644
--- a/src/test/ui/methods/method-call-lifetime-args-fail.stderr
+++ b/src/test/ui/methods/method-call-lifetime-args-fail.stderr
@@ -1,14 +1,14 @@
-error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter
+error[E0090]: wrong number of lifetime arguments: expected 2, found 1
   --> $DIR/method-call-lifetime-args-fail.rs:26:7
    |
 LL |     S.early::<'static>();
-   |       ^^^^^ expected 2 lifetime parameters
+   |       ^^^^^ expected 2 lifetime arguments
 
-error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters
-  --> $DIR/method-call-lifetime-args-fail.rs:28:33
+error[E0088]: wrong number of lifetime arguments: expected 2, found 3
+  --> $DIR/method-call-lifetime-args-fail.rs:28:7
    |
 LL |     S.early::<'static, 'static, 'static>();
-   |                                 ^^^^^^^ expected 2 lifetime parameters
+   |       ^^^^^ unexpected lifetime argument
 
 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present
   --> $DIR/method-call-lifetime-args-fail.rs:37:15
@@ -178,17 +178,17 @@ note: the late bound lifetime parameter is introduced here
 LL |     fn late_unused_early<'a, 'b>(self) -> &'b u8 { loop {} }
    |                          ^^
 
-error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter
+error[E0090]: wrong number of lifetime arguments: expected 2, found 1
   --> $DIR/method-call-lifetime-args-fail.rs:73:5
    |
 LL |     S::early::<'static>(S);
-   |     ^^^^^^^^^^^^^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^^^^^^^^ expected 2 lifetime arguments
 
-error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters
-  --> $DIR/method-call-lifetime-args-fail.rs:75:34
+error[E0088]: wrong number of lifetime arguments: expected 2, found 3
+  --> $DIR/method-call-lifetime-args-fail.rs:75:5
    |
 LL |     S::early::<'static, 'static, 'static>(S);
-   |                                  ^^^^^^^ expected 2 lifetime parameters
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
 error: aborting due to 18 previous errors
 
diff --git a/src/test/ui/seq-args.stderr b/src/test/ui/seq-args.stderr
index dc9d0a7fc0b..0a68c9b917f 100644
--- a/src/test/ui/seq-args.stderr
+++ b/src/test/ui/seq-args.stderr
@@ -2,13 +2,13 @@ error[E0244]: wrong number of type arguments: expected 0, found 1
   --> $DIR/seq-args.rs:14:9
    |
 LL | impl<T> seq<T> for Vec<T> { //~ ERROR wrong number of type arguments
-   |         ^^^^^^ expected no type arguments
+   |         ^^^^^^ unexpected type argument
 
 error[E0244]: wrong number of type arguments: expected 0, found 1
   --> $DIR/seq-args.rs:17:6
    |
 LL | impl seq<bool> for u32 { //~ ERROR wrong number of type arguments
-   |      ^^^^^^^^^ expected no type arguments
+   |      ^^^^^^^^^ unexpected type argument
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
index 1a88bc09dd6..88e3b85bca5 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -74,7 +74,7 @@ error[E0244]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:58:15
    |
 LL |     let pt3 = PointF::<i32> { //~ ERROR wrong number of type arguments
-   |               ^^^^^^^^^^^^^ expected no type arguments
+   |               ^^^^^^^^^^^^^ unexpected type argument
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:59:12
@@ -104,7 +104,7 @@ error[E0244]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:64:9
    |
 LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
-   |         ^^^^^^^^^^^^^ expected no type arguments
+   |         ^^^^^^^^^^^^^ unexpected type argument
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:64:9
diff --git a/src/test/ui/traits/trait-object-vs-lifetime.stderr b/src/test/ui/traits/trait-object-vs-lifetime.stderr
index d875e7d4845..ac9158dc287 100644
--- a/src/test/ui/traits/trait-object-vs-lifetime.stderr
+++ b/src/test/ui/traits/trait-object-vs-lifetime.stderr
@@ -10,11 +10,11 @@ error[E0224]: at least one non-builtin trait is required for an object type
 LL |     let _: S<'static, 'static +>;
    |                       ^^^^^^^^^
 
-error[E0107]: wrong number of lifetime parameters: expected 1, found 2
+error[E0107]: wrong number of lifetime arguments: expected 1, found 2
   --> $DIR/trait-object-vs-lifetime.rs:23:12
    |
 LL |     let _: S<'static, 'static>;
-   |            ^^^^^^^^^^^^^^^^^^^ unexpected lifetime parameter
+   |            ^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument
 
 error[E0243]: wrong number of type arguments: expected 1, found 0
   --> $DIR/trait-object-vs-lifetime.rs:23:12
diff --git a/src/test/ui/traits/trait-test-2.stderr b/src/test/ui/traits/trait-test-2.stderr
index 58e91447963..820c9a4d835 100644
--- a/src/test/ui/traits/trait-test-2.stderr
+++ b/src/test/ui/traits/trait-test-2.stderr
@@ -1,14 +1,14 @@
-error[E0087]: too many type parameters provided: expected at most 0 type parameters, found 1 type parameter
-  --> $DIR/trait-test-2.rs:18:14
+error[E0087]: wrong number of type arguments: expected 0, found 1
+  --> $DIR/trait-test-2.rs:18:8
    |
-LL |     10.dup::<i32>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter
-   |              ^^^ expected 0 type parameters
+LL |     10.dup::<i32>(); //~ ERROR wrong number of type arguments: expected 0, found 1
+   |        ^^^ unexpected type argument
 
-error[E0087]: too many type parameters provided: expected at most 1 type parameter, found 2 type parameters
-  --> $DIR/trait-test-2.rs:19:20
+error[E0087]: wrong number of type arguments: expected 1, found 2
+  --> $DIR/trait-test-2.rs:19:8
    |
-LL |     10.blah::<i32, i32>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters
-   |                    ^^^ expected 1 type parameter
+LL |     10.blah::<i32, i32>(); //~ ERROR wrong number of type arguments: expected 1, found 2
+   |        ^^^^ unexpected type argument
 
 error[E0277]: the trait bound `dyn bar: bar` is not satisfied
   --> $DIR/trait-test-2.rs:20:26
diff --git a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr b/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr
index 6c752dba6b4..2653b7bf4ac 100644
--- a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr
+++ b/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr
@@ -1,8 +1,8 @@
-error[E0089]: too few type parameters provided: expected 1 type parameter, found 0 type parameters
+error[E0089]: wrong number of type arguments: expected 1, found 0
   --> $DIR/ufcs-qpath-missing-params.rs:24:5
    |
 LL |     <String as IntoCow>::into_cow("foo".to_string());
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 type parameter
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 type argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
index 663034ba143..2245c5e6648 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr
@@ -1,8 +1,8 @@
-error[E0107]: wrong number of lifetime parameters: expected 1, found 0
+error[E0107]: wrong number of lifetime arguments: expected 1, found 0
   --> $DIR/unboxed-closure-sugar-region.rs:40:43
    |
 LL | fn test2(x: &Foo<(isize,),Output=()>, y: &Foo(isize)) {
-   |                                           ^^^^^^^^^^ expected 1 lifetime parameter
+   |                                           ^^^^^^^^^^ expected 1 lifetime argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
index 457bea046c7..74faa69918e 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr
@@ -2,7 +2,7 @@ error[E0244]: wrong number of type arguments: expected 0, found 1
   --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:15:11
    |
 LL | fn foo(_: Zero())
-   |           ^^^^^^ expected no type arguments
+   |           ^^^^^^ unexpected type argument
 
 error[E0220]: associated type `Output` not found for `Zero`
   --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:15:15