Update tests

8 files changed, 24 insertions, 24 deletions

diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr b/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
index 37c7a571d0f..8d308f0c96f 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
@@ -1,7 +1,7 @@
 error[E0658]: no_core is experimental (see issue #29639)
   --> $DIR/cfg-attr-crate-2.rs:6:21
    |
-LL | #![cfg_attr(broken, no_core)] //~ ERROR no_core is experimental
+LL | #![cfg_attr(broken, no_core)]
    |                     ^^^^^^^
    |
    = help: add #![feature(no_core)] to the crate attributes to enable
diff --git a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr b/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
index d75a0389851..96c571ebebd 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-invalid-predicate.stderr
@@ -1,7 +1,7 @@
 error[E0537]: invalid predicate `foo`
   --> $DIR/cfg-attr-invalid-predicate.rs:1:7
    |
-LL | #[cfg(foo(bar))] //~ ERROR invalid predicate `foo`
+LL | #[cfg(foo(bar))]
    |       ^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
index 8cdf4ec31e7..8485459ca6b 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
@@ -1,7 +1,7 @@
 error[E0658]: no_core is experimental (see issue #29639)
   --> $DIR/cfg-attr-multi-invalid-1.rs:4:21
    |
-LL | #![cfg_attr(broken, no_core, no_std)] //~ ERROR no_core is experimental
+LL | #![cfg_attr(broken, no_core, no_std)]
    |                     ^^^^^^^
    |
    = help: add #![feature(no_core)] to the crate attributes to enable
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
index b3a3b0c0f97..2a673ea8131 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
@@ -1,7 +1,7 @@
 error[E0658]: no_core is experimental (see issue #29639)
   --> $DIR/cfg-attr-multi-invalid-2.rs:4:29
    |
-LL | #![cfg_attr(broken, no_std, no_core)] //~ ERROR no_core is experimental
+LL | #![cfg_attr(broken, no_std, no_core)]
    |                             ^^^^^^^
    |
    = help: add #![feature(no_core)] to the crate attributes to enable
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
index 3d14c197397..64e9570773a 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
@@ -1,7 +1,7 @@
 warning: use of deprecated item 'MustUseDeprecated'
   --> $DIR/cfg-attr-multi-true.rs:12:6
    |
-LL | impl MustUseDeprecated { //~ warning: use of deprecated item
+LL | impl MustUseDeprecated {
    |      ^^^^^^^^^^^^^^^^^
    |
    = note: #[warn(deprecated)] on by default
@@ -9,25 +9,25 @@ LL | impl MustUseDeprecated { //~ warning: use of deprecated item
 warning: use of deprecated item 'MustUseDeprecated'
   --> $DIR/cfg-attr-multi-true.rs:19:5
    |
-LL |     MustUseDeprecated::new(); //~ warning: use of deprecated item
+LL |     MustUseDeprecated::new();
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 warning: use of deprecated item 'MustUseDeprecated'
   --> $DIR/cfg-attr-multi-true.rs:13:17
    |
-LL |     fn new() -> MustUseDeprecated { //~ warning: use of deprecated item
+LL |     fn new() -> MustUseDeprecated {
    |                 ^^^^^^^^^^^^^^^^^
 
 warning: use of deprecated item 'MustUseDeprecated'
   --> $DIR/cfg-attr-multi-true.rs:14:9
    |
-LL |         MustUseDeprecated {} //~ warning: use of deprecated item
+LL |         MustUseDeprecated {}
    |         ^^^^^^^^^^^^^^^^^
 
 warning: unused `MustUseDeprecated` that must be used
   --> $DIR/cfg-attr-multi-true.rs:19:5
    |
-LL |     MustUseDeprecated::new(); //~ warning: use of deprecated item
+LL |     MustUseDeprecated::new();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr b/src/test/ui/conditional-compilation/cfg-attr-parse.stderr
index 36c7c817cb3..3dfbd6df256 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-parse.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-parse.stderr
@@ -1,31 +1,31 @@
 error: expected identifier, found `)`
   --> $DIR/cfg-attr-parse.rs:4:12
    |
-LL | #[cfg_attr()] //~ error: expected identifier, found `)`
+LL | #[cfg_attr()]
    |            ^ expected identifier
 
 error: expected `,`, found `)`
   --> $DIR/cfg-attr-parse.rs:8:17
    |
-LL | #[cfg_attr(all())] //~ error: expected `,`, found `)`
+LL | #[cfg_attr(all())]
    |                 ^ expected `,`
 
 error: expected identifier, found `,`
   --> $DIR/cfg-attr-parse.rs:16:18
    |
-LL | #[cfg_attr(all(),,)] //~ ERROR expected identifier
+LL | #[cfg_attr(all(),,)]
    |                  ^ expected identifier
 
 error: expected identifier, found `,`
   --> $DIR/cfg-attr-parse.rs:28:28
    |
-LL | #[cfg_attr(all(), must_use,,)] //~ ERROR expected identifier
+LL | #[cfg_attr(all(), must_use,,)]
    |                            ^ expected identifier
 
 error: expected identifier, found `,`
   --> $DIR/cfg-attr-parse.rs:40:40
    |
-LL | #[cfg_attr(all(), must_use, deprecated,,)] //~ ERROR expected identifier
+LL | #[cfg_attr(all(), must_use, deprecated,,)]
    |                                        ^ expected identifier
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr b/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
index 7dab2b2b53f..ae37461cab8 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
@@ -1,55 +1,55 @@
 error: `cfg` is not followed by parentheses
   --> $DIR/cfg-attr-syntax-validation.rs:1:1
    |
-LL | #[cfg] //~ ERROR `cfg` is not followed by parentheses
+LL | #[cfg]
    | ^^^^^^ help: expected syntax is: `cfg(/* predicate */)`
 
 error: `cfg` is not followed by parentheses
   --> $DIR/cfg-attr-syntax-validation.rs:4:1
    |
-LL | #[cfg = 10] //~ ERROR `cfg` is not followed by parentheses
+LL | #[cfg = 10]
    | ^^^^^^^^^^^ help: expected syntax is: `cfg(/* predicate */)`
 
 error: `cfg` predicate is not specified
   --> $DIR/cfg-attr-syntax-validation.rs:7:1
    |
-LL | #[cfg()] //~ ERROR `cfg` predicate is not specified
+LL | #[cfg()]
    | ^^^^^^^^
 
 error: multiple `cfg` predicates are specified
   --> $DIR/cfg-attr-syntax-validation.rs:10:10
    |
-LL | #[cfg(a, b)] //~ ERROR multiple `cfg` predicates are specified
+LL | #[cfg(a, b)]
    |          ^
 
 error: `cfg` predicate key cannot be a literal
   --> $DIR/cfg-attr-syntax-validation.rs:13:7
    |
-LL | #[cfg("str")] //~ ERROR `cfg` predicate key cannot be a literal
+LL | #[cfg("str")]
    |       ^^^^^
 
 error: `cfg` predicate key must be an identifier
   --> $DIR/cfg-attr-syntax-validation.rs:16:7
    |
-LL | #[cfg(a::b)] //~ ERROR `cfg` predicate key must be an identifier
+LL | #[cfg(a::b)]
    |       ^^^^
 
 error[E0537]: invalid predicate `a`
   --> $DIR/cfg-attr-syntax-validation.rs:19:7
    |
-LL | #[cfg(a())] //~ ERROR invalid predicate `a`
+LL | #[cfg(a())]
    |       ^^^
 
 error[E0565]: literal in `cfg` predicate value must be a string
   --> $DIR/cfg-attr-syntax-validation.rs:22:11
    |
-LL | #[cfg(a = 10)] //~ ERROR literal in `cfg` predicate value must be a string
+LL | #[cfg(a = 10)]
    |           ^^
 
 error[E0565]: literal in `cfg` predicate value must be a string
   --> $DIR/cfg-attr-syntax-validation.rs:25:11
    |
-LL | #[cfg(a = b"hi")]  //~ ERROR literal in `cfg` predicate value must be a string
+LL | #[cfg(a = b"hi")]
    |           ^^^^^ help: consider removing the prefix: `"hi"`
 
 error: expected unsuffixed literal or identifier, found `concat!("nonexistent")`
diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
index c5097c15c3c..d0b59c3994c 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
@@ -1,7 +1,7 @@
 error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
   --> $DIR/cfg-attr-unknown-attribute-macro-expansion.rs:3:27
    |
-LL |         #[cfg_attr(all(), unknown)] //~ ERROR `unknown` is currently unknown
+LL |         #[cfg_attr(all(), unknown)]
    |                           ^^^^^^^
 ...
 LL | foo!();