Fix fallout in tests.

6 files changed, 38 insertions, 44 deletions

diff --git a/src/test/ui/span/import-ty-params.rs b/src/test/ui/span/import-ty-params.rs
index d1e3d20f4ba..793ea68beba 100644
--- a/src/test/ui/span/import-ty-params.rs
+++ b/src/test/ui/span/import-ty-params.rs
@@ -21,10 +21,10 @@ macro_rules! import {
 }
 
 fn f1() {
-    import! { a::b::c::S<u8> } //~ ERROR generic arguments in import path
+    import! { a::b::c::S<u8> } //~ ERROR unexpected generic arguments in path
 }
 fn f2() {
-    import! { a::b::c::S<> } //~ ERROR generic arguments in import path
+    import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
 }
 
 fn main() {}
diff --git a/src/test/ui/span/import-ty-params.stderr b/src/test/ui/span/import-ty-params.stderr
index de959a14cc5..e2c3e34c471 100644
--- a/src/test/ui/span/import-ty-params.stderr
+++ b/src/test/ui/span/import-ty-params.stderr
@@ -1,14 +1,14 @@
-error: generic arguments in import path
-  --> $DIR/import-ty-params.rs:24:25
+error: unexpected generic arguments in path
+  --> $DIR/import-ty-params.rs:24:15
    |
-24 |     import! { a::b::c::S<u8> } //~ ERROR generic arguments in import path
-   |                         ^^^^
+24 |     import! { a::b::c::S<u8> } //~ ERROR unexpected generic arguments in path
+   |               ^^^^^^^^^^^^^^
 
-error: generic arguments in import path
-  --> $DIR/import-ty-params.rs:27:25
+error: unexpected generic arguments in path
+  --> $DIR/import-ty-params.rs:27:15
    |
-27 |     import! { a::b::c::S<> } //~ ERROR generic arguments in import path
-   |                         ^^
+27 |     import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
+   |               ^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/span/macro-ty-params.rs b/src/test/ui/span/macro-ty-params.rs
index 08a7518dff9..c2443b024ce 100644
--- a/src/test/ui/span/macro-ty-params.rs
+++ b/src/test/ui/span/macro-ty-params.rs
@@ -16,16 +16,6 @@ macro_rules! m {
 
 fn main() {
     foo::<T>!();
-    //~^ ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
     foo::<>!();
-    //~^ ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
     m!(MyTrait<>);
-    //~^ ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
-    //~| ERROR generic arguments in macro path
 }
diff --git a/src/test/ui/span/macro-ty-params.stderr b/src/test/ui/span/macro-ty-params.stderr
index f7115a04826..1d2f7bb2f07 100644
--- a/src/test/ui/span/macro-ty-params.stderr
+++ b/src/test/ui/span/macro-ty-params.stderr
@@ -1,3 +1,15 @@
+error: unexpected generic arguments in path
+  --> $DIR/macro-ty-params.rs:20:8
+   |
+20 |     m!(MyTrait<>);
+   |        ^^^^^^^^^
+
+error: unexpected generic arguments in path
+  --> $DIR/macro-ty-params.rs:20:8
+   |
+20 |     m!(MyTrait<>);
+   |        ^^^^^^^^^
+
 error: generic arguments in macro path
   --> $DIR/macro-ty-params.rs:18:8
    |
@@ -5,16 +17,16 @@ error: generic arguments in macro path
    |        ^^^^^
 
 error: generic arguments in macro path
-  --> $DIR/macro-ty-params.rs:22:8
+  --> $DIR/macro-ty-params.rs:19:8
    |
-22 |     foo::<>!();
+19 |     foo::<>!();
    |        ^^^^
 
 error: generic arguments in macro path
-  --> $DIR/macro-ty-params.rs:26:15
+  --> $DIR/macro-ty-params.rs:20:15
    |
-26 |     m!(MyTrait<>);
+20 |     m!(MyTrait<>);
    |               ^^
 
-error: aborting due to 3 previous errors
+error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/span/visibility-ty-params.rs b/src/test/ui/span/visibility-ty-params.rs
index 8d4817e80b9..2a4a5edd04c 100644
--- a/src/test/ui/span/visibility-ty-params.rs
+++ b/src/test/ui/span/visibility-ty-params.rs
@@ -13,11 +13,11 @@ macro_rules! m {
 }
 
 struct S<T>(T);
-m!{ S<u8> } //~ ERROR generic arguments in visibility path
+m!{ S<u8> } //~ ERROR unexpected generic arguments in path
 //~^ ERROR expected module, found struct `S`
 
 mod m {
-    m!{ m<> } //~ ERROR generic arguments in visibility path
+    m!{ m<> } //~ ERROR unexpected generic arguments in path
 }
 
 fn main() {}
diff --git a/src/test/ui/span/visibility-ty-params.stderr b/src/test/ui/span/visibility-ty-params.stderr
index 344cf69748e..673b9a38e03 100644
--- a/src/test/ui/span/visibility-ty-params.stderr
+++ b/src/test/ui/span/visibility-ty-params.stderr
@@ -1,22 +1,14 @@
-error: generic arguments in visibility path
-  --> $DIR/visibility-ty-params.rs:16:6
-   |
-16 | m!{ S<u8> } //~ ERROR generic arguments in visibility path
-   |      ^^^^
-
-error: generic arguments in visibility path
-  --> $DIR/visibility-ty-params.rs:20:10
+error: unexpected generic arguments in path
+  --> $DIR/visibility-ty-params.rs:16:5
    |
-20 |     m!{ m<> } //~ ERROR generic arguments in visibility path
-   |          ^^
+16 | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
+   |     ^^^^^
 
-error[E0577]: expected module, found struct `S`
-  --> $DIR/visibility-ty-params.rs:16:5
+error: unexpected generic arguments in path
+  --> $DIR/visibility-ty-params.rs:20:9
    |
-16 | m!{ S<u8> } //~ ERROR generic arguments in visibility path
-   |     -^^^^
-   |     |
-   |     did you mean `m`?
+20 |     m!{ m<> } //~ ERROR unexpected generic arguments in path
+   |         ^^^
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors