fix error messages

4 files changed, 21 insertions, 11 deletions

diff --git a/src/test/ui/underscore-lifetime/in-struct.rs b/src/test/ui/underscore-lifetime/in-struct.rs
index be605ed50a5..201147840f6 100644
--- a/src/test/ui/underscore-lifetime/in-struct.rs
+++ b/src/test/ui/underscore-lifetime/in-struct.rs
@@ -16,7 +16,7 @@ struct Foo {
     x: &'_ u32, //~ ERROR
 }
 
-struct Bar {
+enum Bar {
     Variant(&'_ u32), //~ ERROR
 }
 
diff --git a/src/test/ui/underscore-lifetime/in-struct.stderr b/src/test/ui/underscore-lifetime/in-struct.stderr
index b60b3db408d..072bd6b7d0b 100644
--- a/src/test/ui/underscore-lifetime/in-struct.stderr
+++ b/src/test/ui/underscore-lifetime/in-struct.stderr
@@ -1,15 +1,15 @@
-error: expected `:`, found `(`
-  --> $DIR/in-struct.rs:20:12
-   |
-LL |     Variant(&'_ u32), //~ ERROR
-   |            ^ expected `:`
-
 error[E0106]: missing lifetime specifier
   --> $DIR/in-struct.rs:16:9
    |
 LL |     x: &'_ u32, //~ ERROR
    |         ^^ expected lifetime parameter
 
+error[E0106]: missing lifetime specifier
+  --> $DIR/in-struct.rs:20:14
+   |
+LL |     Variant(&'_ u32), //~ ERROR
+   |              ^^ expected lifetime parameter
+
 error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/underscore-lifetime/where-clauses.rs b/src/test/ui/underscore-lifetime/where-clauses.rs
index da91718fec3..ee6823b8047 100644
--- a/src/test/ui/underscore-lifetime/where-clauses.rs
+++ b/src/test/ui/underscore-lifetime/where-clauses.rs
@@ -1,3 +1,7 @@
 trait Foo<'a> {}
-impl<'b: '_> Foo<'b> for i32 {}
+
+impl<'b: '_> Foo<'b> for i32 {} //~ ERROR `'_` cannot be used here
+
+impl<T: '_> Foo<'static> for Vec<T> {} //~ ERROR `'_` cannot be used here
+
 fn main() { }
diff --git a/src/test/ui/underscore-lifetime/where-clauses.stderr b/src/test/ui/underscore-lifetime/where-clauses.stderr
index 98ac5b5b3dc..57fe2456f4c 100644
--- a/src/test/ui/underscore-lifetime/where-clauses.stderr
+++ b/src/test/ui/underscore-lifetime/where-clauses.stderr
@@ -1,9 +1,15 @@
 error[E0637]: `'_` cannot be used here
-  --> $DIR/where-clauses.rs:2:10
+  --> $DIR/where-clauses.rs:3:10
    |
-LL | impl<'b: '_> Foo<'b> for i32 {}
+LL | impl<'b: '_> Foo<'b> for i32 {} //~ ERROR `'_` cannot be used here
    |          ^^ `'_` is a reserved lifetime name
 
-error: aborting due to previous error
+error[E0637]: `'_` cannot be used here
+  --> $DIR/where-clauses.rs:5:9
+   |
+LL | impl<T: '_> Foo<'static> for Vec<T> {} //~ ERROR `'_` cannot be used here
+   |         ^^ `'_` is a reserved lifetime name
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0637`.