--bless some tests due to message format change.

Centril · Centril · commit 3e061f7c4951 · 2019-08-23T01:42:05.000+02:00
diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.rs b/src/test/ui/conditional-compilation/cfg-attr-crate-2.rs
@@ -3,6 +3,6 @@
 // compile-flags: --cfg broken
 
 #![crate_type = "lib"]
-#![cfg_attr(broken, no_core)] //~ ERROR no_core is experimental
+#![cfg_attr(broken, no_core)] //~ ERROR the `#[no_core]` attribute is an experimental feature
 
 pub struct S {}
diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr b/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
@@ -1,4 +1,4 @@
-error[E0658]: no_core is experimental
+error[E0658]: the `#[no_core]` attribute is an experimental feature
   --> $DIR/cfg-attr-crate-2.rs:6:21
    |
 LL | #![cfg_attr(broken, no_core)]
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.rs
@@ -1,6 +1,7 @@
 // compile-flags: --cfg broken
 
 #![crate_type = "lib"]
-#![cfg_attr(broken, no_core, no_std)] //~ ERROR no_core is experimental
+#![cfg_attr(broken, no_core, no_std)]
+//~^ ERROR the `#[no_core]` attribute is an experimental feature
 
 pub struct S {}
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
@@ -1,4 +1,4 @@
-error[E0658]: no_core is experimental
+error[E0658]: the `#[no_core]` attribute is an experimental feature
   --> $DIR/cfg-attr-multi-invalid-1.rs:4:21
    |
 LL | #![cfg_attr(broken, no_core, no_std)]
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs
@@ -1,6 +1,7 @@
 // compile-flags: --cfg broken
 
 #![crate_type = "lib"]
-#![cfg_attr(broken, no_std, no_core)] //~ ERROR no_core is experimental
+#![cfg_attr(broken, no_std, no_core)]
+//~^ ERROR the `#[no_core]` attribute is an experimental feature
 
 pub struct S {}
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
@@ -1,4 +1,4 @@
-error[E0658]: no_core is experimental
+error[E0658]: the `#[no_core]` attribute is an experimental feature
   --> $DIR/cfg-attr-multi-invalid-2.rs:4:29
    |
 LL | #![cfg_attr(broken, no_std, no_core)]
diff --git a/src/test/ui/feature-gate-optimize_attribute.rs b/src/test/ui/feature-gate-optimize_attribute.rs
@@ -1,17 +1,17 @@
 #![crate_type="rlib"]
-#![optimize(speed)] //~ ERROR `#[optimize]` attribute is an unstable feature
+#![optimize(speed)] //~ ERROR the `#[optimize]` attribute is an experimental feature
 
-#[optimize(size)] //~ ERROR `#[optimize]` attribute is an unstable feature
+#[optimize(size)] //~ ERROR the `#[optimize]` attribute is an experimental feature
 mod module {
 
-#[optimize(size)] //~ ERROR `#[optimize]` attribute is an unstable feature
+#[optimize(size)] //~ ERROR the `#[optimize]` attribute is an experimental feature
 fn size() {}
 
-#[optimize(speed)] //~ ERROR `#[optimize]` attribute is an unstable feature
+#[optimize(speed)] //~ ERROR the `#[optimize]` attribute is an experimental feature
 fn speed() {}
 
 #[optimize(banana)]
-//~^ ERROR `#[optimize]` attribute is an unstable feature
+//~^ ERROR the `#[optimize]` attribute is an experimental feature
 //~| ERROR E0722
 fn not_known() {}
 
diff --git a/src/test/ui/feature-gate-optimize_attribute.stderr b/src/test/ui/feature-gate-optimize_attribute.stderr
@@ -1,4 +1,4 @@
-error[E0658]: `#[optimize]` attribute is an unstable feature
+error[E0658]: the `#[optimize]` attribute is an experimental feature
   --> $DIR/feature-gate-optimize_attribute.rs:7:1
    |
 LL | #[optimize(size)]
@@ -7,7 +7,7 @@ LL | #[optimize(size)]
    = note: for more information, see https://github.com/rust-lang/rust/issues/54882
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
-error[E0658]: `#[optimize]` attribute is an unstable feature
+error[E0658]: the `#[optimize]` attribute is an experimental feature
   --> $DIR/feature-gate-optimize_attribute.rs:10:1
    |
 LL | #[optimize(speed)]
@@ -16,7 +16,7 @@ LL | #[optimize(speed)]
    = note: for more information, see https://github.com/rust-lang/rust/issues/54882
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
-error[E0658]: `#[optimize]` attribute is an unstable feature
+error[E0658]: the `#[optimize]` attribute is an experimental feature
   --> $DIR/feature-gate-optimize_attribute.rs:13:1
    |
 LL | #[optimize(banana)]
@@ -25,7 +25,7 @@ LL | #[optimize(banana)]
    = note: for more information, see https://github.com/rust-lang/rust/issues/54882
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
-error[E0658]: `#[optimize]` attribute is an unstable feature
+error[E0658]: the `#[optimize]` attribute is an experimental feature
   --> $DIR/feature-gate-optimize_attribute.rs:4:1
    |
 LL | #[optimize(size)]
@@ -34,7 +34,7 @@ LL | #[optimize(size)]
    = note: for more information, see https://github.com/rust-lang/rust/issues/54882
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
-error[E0658]: `#[optimize]` attribute is an unstable feature
+error[E0658]: the `#[optimize]` attribute is an experimental feature
   --> $DIR/feature-gate-optimize_attribute.rs:2:1
    |
 LL | #![optimize(speed)]
diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs
@@ -5,7 +5,7 @@
 
 use core::alloc::Layout;
 
-#[alloc_error_handler] //~ ERROR `#[alloc_error_handler]` is an unstable feature
+#[alloc_error_handler] //~ ERROR the `#[alloc_error_handler]` attribute is an experimental feature
 fn oom(info: Layout) -> ! {
     loop {}
 }
diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr
@@ -1,4 +1,4 @@
-error[E0658]: `#[alloc_error_handler]` is an unstable feature
+error[E0658]: the `#[alloc_error_handler]` attribute is an experimental feature
   --> $DIR/feature-gate-alloc-error-handler.rs:8:1
    |
 LL | #[alloc_error_handler]
diff --git a/src/test/ui/feature-gates/feature-gate-allow_fail.rs b/src/test/ui/feature-gates/feature-gate-allow_fail.rs
@@ -1,6 +1,6 @@
 // check that #[allow_fail] is feature-gated
 
-#[allow_fail] //~ ERROR allow_fail attribute is currently unstable
+#[allow_fail] //~ ERROR the `#[allow_fail]` attribute is an experimental feature
 fn ok_to_fail() {
     assert!(false);
 }
diff --git a/src/test/ui/feature-gates/feature-gate-allow_fail.stderr b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr
@@ -1,4 +1,4 @@
-error[E0658]: allow_fail attribute is currently unstable
+error[E0658]: the `#[allow_fail]` attribute is an experimental feature
   --> $DIR/feature-gate-allow_fail.rs:3:1
    |
 LL | #[allow_fail]
diff --git a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.rs b/src/test/ui/feature-gates/feature-gate-marker_trait_attr.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Debug, Display};
 
 #[marker] trait ExplicitMarker {}
-//~^ ERROR marker traits is an experimental feature
+//~^ ERROR the `#[marker]` attribute is an experimental feature
 
 impl<T: Display> ExplicitMarker for T {}
 impl<T: Debug> ExplicitMarker for T {}
diff --git a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr b/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr
@@ -1,4 +1,4 @@
-error[E0658]: marker traits is an experimental feature
+error[E0658]: the `#[marker]` attribute is an experimental feature
   --> $DIR/feature-gate-marker_trait_attr.rs:3:1
    |
 LL | #[marker] trait ExplicitMarker {}
diff --git a/src/test/ui/feature-gates/feature-gate-no_core.rs b/src/test/ui/feature-gates/feature-gate-no_core.rs
@@ -1,5 +1,5 @@
 #![crate_type = "rlib"]
 
-#![no_core] //~ ERROR no_core is experimental
+#![no_core] //~ ERROR the `#[no_core]` attribute is an experimental feature
 
 pub struct S {}
diff --git a/src/test/ui/feature-gates/feature-gate-no_core.stderr b/src/test/ui/feature-gates/feature-gate-no_core.stderr
@@ -1,4 +1,4 @@
-error[E0658]: no_core is experimental
+error[E0658]: the `#[no_core]` attribute is an experimental feature
   --> $DIR/feature-gate-no_core.rs:3:1
    |
 LL | #![no_core]
diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs b/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs
@@ -1,6 +1,6 @@
 //#![feature(non_exhaustive)]
 
-#[non_exhaustive] //~ERROR non exhaustive is an experimental feature
+#[non_exhaustive] //~ERROR the `#[non_exhaustive]` attribute is an experimental feature
 pub enum NonExhaustiveEnum {
     Unit,
     Tuple(u32),
diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr b/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr
@@ -1,4 +1,4 @@
-error[E0658]: non exhaustive is an experimental feature
+error[E0658]: the `#[non_exhaustive]` attribute is an experimental feature
   --> $DIR/feature-gate-non_exhaustive.rs:3:1
    |
 LL | #[non_exhaustive]
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs b/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs
@@ -16,7 +16,7 @@ fn f() {}
 fn g() {}
 
 #[rustc_dummy]
-//~^ ERROR used by the test suite
+//~^ ERROR the `#[rustc_dummy]` attribute is just used for rustc unit tests
 #[rustc_unknown]
 //~^ ERROR attributes starting with `rustc` are reserved for use by the `rustc` compiler
 //~| ERROR cannot find attribute macro `rustc_unknown` in this scope
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
@@ -43,7 +43,7 @@ error: cannot find attribute macro `rustc_unknown` in this scope
 LL | #[rustc_unknown]
    |   ^^^^^^^^^^^^^
 
-error[E0658]: used by the test suite
+error[E0658]: the `#[rustc_dummy]` attribute is just used for rustc unit tests and will never be stable
   --> $DIR/feature-gate-rustc-attrs.rs:18:1
    |
 LL | #[rustc_dummy]
diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs b/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs
@@ -8,7 +8,7 @@ extern {
     fn extern_fn();
 // CHECK-NOT: Function Attrs: nounwind
 // CHECK: declare void @unwinding_extern_fn
-    #[unwind(allowed)] //~ ERROR `#[unwind]` is experimental
+    #[unwind(allowed)] //~ ERROR the `#[unwind]` attribute is an experimental feature
     fn unwinding_extern_fn();
 }
 
diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
@@ -1,4 +1,4 @@
-error[E0658]: `#[unwind]` is experimental
+error[E0658]: the `#[unwind]` attribute is an experimental feature
   --> $DIR/feature-gate-unwind-attributes.rs:11:5
    |
 LL |     #[unwind(allowed)]
diff --git a/src/test/ui/malformed/malformed-regressions.stderr b/src/test/ui/malformed/malformed-regressions.stderr
@@ -26,8 +26,7 @@ LL | #[inline = ""]
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
 
-warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...",
-                                               /*opt*/ cfg = "...")]`
+warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ cfg = "...")]`
   --> $DIR/malformed-regressions.rs:6:1
    |
 LL | #[link]
@@ -36,8 +35,7 @@ LL | #[link]
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
 
-warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...",
-                                               /*opt*/ cfg = "...")]`
+warning: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ cfg = "...")]`
   --> $DIR/malformed-regressions.rs:7:1
    |
 LL | #[link = ""]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-error[E0658]: no_core is experimental`
	`1`	+error[E0658]: the `#[no_core]` attribute is an experimental feature
`2`	`2`	`--> $DIR/cfg-attr-crate-2.rs:6:21`
`3`	`3`	`\|`
`4`	`4`	`LL \| #![cfg_attr(broken, no_core)]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`use core::alloc::Layout;`
`7`	`7`
`8`		-#[alloc_error_handler] //~ ERROR `#[alloc_error_handler]` is an unstable feature
	`8`	+#[alloc_error_handler] //~ ERROR the `#[alloc_error_handler]` attribute is an experimental feature
`9`	`9`	`fn oom(info: Layout) -> ! {`
`10`	`10`	`loop {}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0658]: `#[alloc_error_handler]` is an unstable feature
	`1`	+error[E0658]: the `#[alloc_error_handler]` attribute is an experimental feature
`2`	`2`	`--> $DIR/feature-gate-alloc-error-handler.rs:8:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[alloc_error_handler]`