Update tests

18 files changed, 41 insertions, 41 deletions

diff --git a/src/test/ui/structs/struct-base-wrong-type-2.stderr b/src/test/ui/structs/struct-base-wrong-type-2.stderr
index b15ea51bb2d..d02ed205e92 100644
--- a/src/test/ui/structs/struct-base-wrong-type-2.stderr
+++ b/src/test/ui/structs/struct-base-wrong-type-2.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/struct-base-wrong-type-2.rs:11:27
    |
-LL |     let f = Foo { a: 2, ..b }; //~  ERROR mismatched types
+LL |     let f = Foo { a: 2, ..b };
    |                           ^ expected struct `Foo`, found struct `Bar`
    |
    = note: expected type `Foo`
@@ -10,7 +10,7 @@ LL |     let f = Foo { a: 2, ..b }; //~  ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/struct-base-wrong-type-2.rs:15:34
    |
-LL |     let f__isize = Foo { a: 2, ..4 }; //~  ERROR mismatched types
+LL |     let f__isize = Foo { a: 2, ..4 };
    |                                  ^ expected struct `Foo`, found integer
    |
    = note: expected type `Foo`
diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/src/test/ui/structs/struct-base-wrong-type.stderr
index 045eb610f7d..2491296c5ef 100644
--- a/src/test/ui/structs/struct-base-wrong-type.stderr
+++ b/src/test/ui/structs/struct-base-wrong-type.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/struct-base-wrong-type.rs:10:33
    |
-LL | static foo: Foo = Foo { a: 2, ..bar }; //~  ERROR mismatched types
+LL | static foo: Foo = Foo { a: 2, ..bar };
    |                                 ^^^ expected struct `Foo`, found struct `Bar`
    |
    = note: expected type `Foo`
@@ -10,7 +10,7 @@ LL | static foo: Foo = Foo { a: 2, ..bar }; //~  ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/struct-base-wrong-type.rs:14:35
    |
-LL | static foo_i: Foo = Foo { a: 2, ..4 }; //~  ERROR mismatched types
+LL | static foo_i: Foo = Foo { a: 2, ..4 };
    |                                   ^ expected struct `Foo`, found integer
    |
    = note: expected type `Foo`
diff --git a/src/test/ui/structs/struct-field-privacy.stderr b/src/test/ui/structs/struct-field-privacy.stderr
index 5e30a4e403d..91d000b8672 100644
--- a/src/test/ui/structs/struct-field-privacy.stderr
+++ b/src/test/ui/structs/struct-field-privacy.stderr
@@ -1,31 +1,31 @@
 error[E0616]: field `a` of struct `inner::A` is private
   --> $DIR/struct-field-privacy.rs:23:5
    |
-LL |     b.a; //~ ERROR: field `a` of struct `inner::A` is private
+LL |     b.a;
    |     ^^^
 
 error[E0616]: field `b` of struct `inner::B` is private
   --> $DIR/struct-field-privacy.rs:26:5
    |
-LL |     c.b; //~ ERROR: field `b` of struct `inner::B` is private
+LL |     c.b;
    |     ^^^
 
 error[E0616]: field `a` of struct `xc::A` is private
   --> $DIR/struct-field-privacy.rs:28:5
    |
-LL |     d.a; //~ ERROR: field `a` of struct `xc::A` is private
+LL |     d.a;
    |     ^^^
 
 error[E0616]: field `b` of struct `xc::B` is private
   --> $DIR/struct-field-privacy.rs:32:5
    |
-LL |     e.b; //~ ERROR: field `b` of struct `xc::B` is private
+LL |     e.b;
    |     ^^^
 
 error[E0616]: field `1` of struct `inner::Z` is private
   --> $DIR/struct-field-privacy.rs:35:5
    |
-LL |     z.1; //~ ERROR: field `1` of struct `inner::Z` is private
+LL |     z.1;
    |     ^^^
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/structs/struct-fields-dupe.stderr b/src/test/ui/structs/struct-fields-dupe.stderr
index 7739ef80fc8..aaf2533dc01 100644
--- a/src/test/ui/structs/struct-fields-dupe.stderr
+++ b/src/test/ui/structs/struct-fields-dupe.stderr
@@ -3,7 +3,7 @@ error[E0062]: field `foo` specified more than once
    |
 LL |         foo: 0,
    |         ------ first use of `foo`
-LL |         foo: 0 //~ ERROR field `foo` specified more than once
+LL |         foo: 0
    |         ^^^ used more than once
 
 error: aborting due to previous error
diff --git a/src/test/ui/structs/struct-fields-missing.stderr b/src/test/ui/structs/struct-fields-missing.stderr
index edbac000dea..b3e42a94809 100644
--- a/src/test/ui/structs/struct-fields-missing.stderr
+++ b/src/test/ui/structs/struct-fields-missing.stderr
@@ -1,7 +1,7 @@
 error[E0063]: missing field `bar` in initializer of `BuildData`
   --> $DIR/struct-fields-missing.rs:7:15
    |
-LL |     let foo = BuildData { //~ ERROR missing field `bar` in initializer of `BuildData`
+LL |     let foo = BuildData {
    |               ^^^^^^^^^ missing `bar`
 
 error: aborting due to previous error
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
index 37ec6c0f015..09fc4f7ee58 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
+++ b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/struct-fields-shorthand-unresolved.rs:10:9
    |
-LL |         y //~ ERROR cannot find value `y` in this scope
+LL |         y
    |         ^ help: a local variable with a similar name exists: `x`
 
 error: aborting due to previous error
diff --git a/src/test/ui/structs/struct-fields-shorthand.stderr b/src/test/ui/structs/struct-fields-shorthand.stderr
index 0d3d633f61c..a285a392168 100644
--- a/src/test/ui/structs/struct-fields-shorthand.stderr
+++ b/src/test/ui/structs/struct-fields-shorthand.stderr
@@ -1,7 +1,7 @@
 error[E0560]: struct `Foo` has no field named `z`
   --> $DIR/struct-fields-shorthand.rs:9:15
    |
-LL |         x, y, z //~ ERROR struct `Foo` has no field named `z`
+LL |         x, y, z
    |               ^ `Foo` does not have this field
    |
    = note: available fields are: `x`, `y`
diff --git a/src/test/ui/structs/struct-fields-typo.stderr b/src/test/ui/structs/struct-fields-typo.stderr
index c2fab714f7c..6949a0a4a68 100644
--- a/src/test/ui/structs/struct-fields-typo.stderr
+++ b/src/test/ui/structs/struct-fields-typo.stderr
@@ -1,7 +1,7 @@
 error[E0609]: no field `baa` on type `BuildData`
   --> $DIR/struct-fields-typo.rs:11:17
    |
-LL |     let x = foo.baa; //~ ERROR no field `baa` on type `BuildData`
+LL |     let x = foo.baa;
    |                 ^^^ help: a field with a similar name exists: `bar`
 
 error: aborting due to previous error
diff --git a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
index 0aa85eb7253..d6b5af17964 100644
--- a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
+++ b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr
@@ -8,7 +8,7 @@ LL | |     C
 LL | | }
    | |_- `A` defined here
 ...
-LL |       match x {   //~ ERROR non-exhaustive patterns
+LL |       match x {
    |             ^ pattern `B { x: Some(_) }` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
diff --git a/src/test/ui/structs/struct-missing-comma.stderr b/src/test/ui/structs/struct-missing-comma.stderr
index 00ef1a7ff92..f5b79f54001 100644
--- a/src/test/ui/structs/struct-missing-comma.stderr
+++ b/src/test/ui/structs/struct-missing-comma.stderr
@@ -1,7 +1,7 @@
 error: expected `,`, or `}`, found `bar`
   --> $DIR/struct-missing-comma.rs:4:13
    |
-LL |     foo: u32 //~ expected `,`, or `}`, found `bar`
+LL |     foo: u32
    |             ^ help: try adding a comma: `,`
 
 error: aborting due to previous error
diff --git a/src/test/ui/structs/struct-pat-derived-error.stderr b/src/test/ui/structs/struct-pat-derived-error.stderr
index dd1dc71f7fd..92a88defc52 100644
--- a/src/test/ui/structs/struct-pat-derived-error.stderr
+++ b/src/test/ui/structs/struct-pat-derived-error.stderr
@@ -1,19 +1,19 @@
 error[E0609]: no field `d` on type `&A`
   --> $DIR/struct-pat-derived-error.rs:8:31
    |
-LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
+LL |         let A { x, y } = self.d;
    |                               ^
 
 error[E0026]: struct `A` does not have fields named `x`, `y`
   --> $DIR/struct-pat-derived-error.rs:8:17
    |
-LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
+LL |         let A { x, y } = self.d;
    |                 ^  ^ struct `A` does not have these fields
 
 error[E0027]: pattern does not mention fields `b`, `c`
   --> $DIR/struct-pat-derived-error.rs:8:13
    |
-LL |         let A { x, y } = self.d; //~ ERROR no field `d` on type `&A`
+LL |         let A { x, y } = self.d;
    |             ^^^^^^^^^^ missing fields `b`, `c`
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/structs/struct-path-associated-type.stderr b/src/test/ui/structs/struct-path-associated-type.stderr
index 80824d98478..0ca64ed40a5 100644
--- a/src/test/ui/structs/struct-path-associated-type.stderr
+++ b/src/test/ui/structs/struct-path-associated-type.stderr
@@ -25,31 +25,31 @@ LL |         T::A {} => {}
 error[E0109]: type arguments are not allowed on this entity
   --> $DIR/struct-path-associated-type.rs:25:20
    |
-LL |     let z = T::A::<u8> {}; //~ ERROR type arguments are not allowed on this entity
+LL |     let z = T::A::<u8> {};
    |                    ^^ type argument not allowed
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:32:13
    |
-LL |     let s = S::A {}; //~ ERROR ambiguous associated type
+LL |     let s = S::A {};
    |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
 
 error[E0109]: type arguments are not allowed on this entity
   --> $DIR/struct-path-associated-type.rs:33:20
    |
-LL |     let z = S::A::<u8> {}; //~ ERROR ambiguous associated type
+LL |     let z = S::A::<u8> {};
    |                    ^^ type argument not allowed
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:33:13
    |
-LL |     let z = S::A::<u8> {}; //~ ERROR ambiguous associated type
+LL |     let z = S::A::<u8> {};
    |             ^^^^^^^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:36:9
    |
-LL |         S::A {} => {} //~ ERROR ambiguous associated type
+LL |         S::A {} => {}
    |         ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
 
 error: aborting due to 9 previous errors
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.stderr b/src/test/ui/structs/struct-path-self-type-mismatch.stderr
index 0b1b1e83400..72c6d7ae22b 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.stderr
+++ b/src/test/ui/structs/struct-path-self-type-mismatch.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/struct-path-self-type-mismatch.rs:7:23
    |
-LL |         Self { inner: 1.5f32 }; //~ ERROR mismatched types
+LL |         Self { inner: 1.5f32 };
    |                       ^^^^^^ expected i32, found f32
 
 error[E0308]: mismatched types
@@ -19,9 +19,9 @@ error[E0308]: mismatched types
 LL |       fn new<U>(u: U) -> Foo<U> {
    |                          ------ expected `Foo<U>` because of return type
 LL | /         Self {
-LL | |         //~^ ERROR mismatched types
+LL | |
 LL | |             inner: u
-LL | |             //~^ ERROR mismatched types
+LL | |
 LL | |         }
    | |_________^ expected type parameter, found a different type parameter
    |
diff --git a/src/test/ui/structs/struct-path-self.stderr b/src/test/ui/structs/struct-path-self.stderr
index cda6b7a533f..0fb02b9c44b 100644
--- a/src/test/ui/structs/struct-path-self.stderr
+++ b/src/test/ui/structs/struct-path-self.stderr
@@ -25,13 +25,13 @@ LL |             Self { .. } => {}
 error[E0109]: type arguments are not allowed on this entity
   --> $DIR/struct-path-self.rs:20:24
    |
-LL |         let z = Self::<u8> {}; //~ ERROR type arguments are not allowed on this entity
+LL |         let z = Self::<u8> {};
    |                        ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed on this entity
   --> $DIR/struct-path-self.rs:30:24
    |
-LL |         let z = Self::<u8> {}; //~ ERROR type arguments are not allowed on this entity
+LL |         let z = Self::<u8> {};
    |                        ^^ type argument not allowed
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/structs/struct-pattern-match-useless.stderr b/src/test/ui/structs/struct-pattern-match-useless.stderr
index 561964bcb24..5b0c9305448 100644
--- a/src/test/ui/structs/struct-pattern-match-useless.stderr
+++ b/src/test/ui/structs/struct-pattern-match-useless.stderr
@@ -1,7 +1,7 @@
 error: unreachable pattern
   --> $DIR/struct-pattern-match-useless.rs:12:9
    |
-LL |         Foo { .. } => () //~ ERROR unreachable pattern
+LL |         Foo { .. } => ()
    |         ^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.stderr b/src/test/ui/structs/struct-variant-privacy-xc.stderr
index da61fc83c26..39241b6b3fc 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.stderr
+++ b/src/test/ui/structs/struct-variant-privacy-xc.stderr
@@ -1,13 +1,13 @@
 error[E0603]: enum `Bar` is private
   --> $DIR/struct-variant-privacy-xc.rs:4:33
    |
-LL | fn f(b: struct_variant_privacy::Bar) { //~ ERROR enum `Bar` is private
+LL | fn f(b: struct_variant_privacy::Bar) {
    |                                 ^^^
 
 error[E0603]: enum `Bar` is private
   --> $DIR/struct-variant-privacy-xc.rs:6:33
    |
-LL |         struct_variant_privacy::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private
+LL |         struct_variant_privacy::Bar::Baz { a: _a } => {}
    |                                 ^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/structs/struct-variant-privacy.stderr b/src/test/ui/structs/struct-variant-privacy.stderr
index 0895b52998c..127a6501044 100644
--- a/src/test/ui/structs/struct-variant-privacy.stderr
+++ b/src/test/ui/structs/struct-variant-privacy.stderr
@@ -1,13 +1,13 @@
 error[E0603]: enum `Bar` is private
   --> $DIR/struct-variant-privacy.rs:7:14
    |
-LL | fn f(b: foo::Bar) { //~ ERROR enum `Bar` is private
+LL | fn f(b: foo::Bar) {
    |              ^^^
 
 error[E0603]: enum `Bar` is private
   --> $DIR/struct-variant-privacy.rs:9:14
    |
-LL |         foo::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private
+LL |         foo::Bar::Baz { a: _a } => {}
    |              ^^^
 
 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 cc62316bec1..375678b7cee 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -73,13 +73,13 @@ LL |         x: 7,
 error[E0107]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:48:24
    |
-LL |     let pt3 = PointF::<i32> { //~ ERROR wrong number of type arguments
+LL |     let pt3 = PointF::<i32> {
    |                        ^^^ unexpected type argument
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:49:12
    |
-LL |         x: 9,  //~ ERROR mismatched types
+LL |         x: 9,
    |            ^
    |            |
    |            expected f32, found integer
@@ -91,7 +91,7 @@ LL |         x: 9,  //~ ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:50:12
    |
-LL |         y: 10, //~ ERROR mismatched types
+LL |         y: 10,
    |            ^^
    |            |
    |            expected f32, found integer
@@ -103,7 +103,7 @@ LL |         y: 10, //~ ERROR mismatched types
 error[E0107]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:54:18
    |
-LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
+LL |         PointF::<u32> { .. } => {}
    |                  ^^^ unexpected type argument
 
 error[E0308]: mismatched types
@@ -111,7 +111,7 @@ error[E0308]: mismatched types
    |
 LL |     match (Point { x: 1, y: 2 }) {
    |           ---------------------- this match expression has type `Point<{integer}>`
-LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
+LL |         PointF::<u32> { .. } => {}
    |         ^^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |
    = note: expected type `Point<{integer}>`
@@ -122,7 +122,7 @@ error[E0308]: mismatched types
    |
 LL |     match (Point { x: 1, y: 2 }) {
    |           ---------------------- this match expression has type `Point<{integer}>`
-LL |         PointF { .. } => {} //~ ERROR mismatched types
+LL |         PointF { .. } => {}
    |         ^^^^^^^^^^^^^ expected integer, found f32
    |
    = note: expected type `Point<{integer}>`
@@ -133,7 +133,7 @@ error[E0308]: mismatched types
    |
 LL |     match (Pair { x: 1, y: 2 }) {
    |           --------------------- this match expression has type `Pair<{integer}, {integer}>`
-LL |         PairF::<u32> { .. } => {} //~ ERROR mismatched types
+LL |         PairF::<u32> { .. } => {}
    |         ^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |
    = note: expected type `Pair<{integer}, {integer}>`