Update reserved prefixes test for new edition lint wording.

m-ou-se · m-ou-se · commit f6dd1378f091 · 2021-06-26T20:49:29.000Z
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.fixed b/src/test/ui/rust-2021/reserved-prefixes-migration.fixed
@@ -15,16 +15,16 @@ macro_rules! m3 {
 fn main() {
     m2!(z "hey");
     //~^ WARNING prefix `z` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m2!(prefix "hey");
     //~^ WARNING prefix `prefix` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m3!(hey #123);
     //~^ WARNING prefix `hey` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m3!(hey #hey);
     //~^ WARNING prefix `hey` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
 }
 
 macro_rules! quote {
@@ -34,5 +34,5 @@ macro_rules! quote {
 quote! {
     #name = #kind #value
     //~^ WARNING prefix `kind` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
 }
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.rs b/src/test/ui/rust-2021/reserved-prefixes-migration.rs
@@ -15,16 +15,16 @@ macro_rules! m3 {
 fn main() {
     m2!(z"hey");
     //~^ WARNING prefix `z` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m2!(prefix"hey");
     //~^ WARNING prefix `prefix` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m3!(hey#123);
     //~^ WARNING prefix `hey` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
     m3!(hey#hey);
     //~^ WARNING prefix `hey` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
 }
 
 macro_rules! quote {
@@ -34,5 +34,5 @@ macro_rules! quote {
 quote! {
     #name = #kind#value
     //~^ WARNING prefix `kind` is unknown [reserved_prefix]
-    //~| WARNING become a hard error
+    //~| WARNING hard error in Rust 2021
 }
diff --git a/src/test/ui/rust-2021/reserved-prefixes-migration.stderr b/src/test/ui/rust-2021/reserved-prefixes-migration.stderr
@@ -9,7 +9,7 @@ note: the lint level is defined here
    |
 LL | #![warn(reserved_prefix)]
    |         ^^^^^^^^^^^^^^^
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021
    |
@@ -22,7 +22,7 @@ warning: prefix `prefix` is unknown
 LL |     m2!(prefix"hey");
    |         ^^^^^^ unknown prefix
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021
    |
@@ -35,7 +35,7 @@ warning: prefix `hey` is unknown
 LL |     m3!(hey#123);
    |         ^^^ unknown prefix
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021
    |
@@ -48,7 +48,7 @@ warning: prefix `hey` is unknown
 LL |     m3!(hey#hey);
    |         ^^^ unknown prefix
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021
    |
@@ -61,7 +61,7 @@ warning: prefix `kind` is unknown
 LL |     #name = #kind#value
    |              ^^^^ unknown prefix
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!
    = note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>
 help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021
    |

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ note: the lint level is defined here`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![warn(reserved_prefix)]`
`11`	`11`	`\| ^^^^^^^^^^^^^^^`
`12`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!`
	`12`	`+ = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`13`	`13`	`= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>`
`14`	`14`	`help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021`
`15`	`15`	`\|`
@@ -22,7 +22,7 @@ warning: prefix `prefix` is unknown
`22`	`22`	`LL \| m2!(prefix"hey");`
`23`	`23`	`\| ^^^^^^ unknown prefix`
`24`	`24`	`\|`
`25`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!`
	`25`	`+ = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`26`	`26`	`= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>`
`27`	`27`	`help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021`
`28`	`28`	`\|`
@@ -35,7 +35,7 @@ warning: prefix `hey` is unknown
`35`	`35`	`LL \| m3!(hey#123);`
`36`	`36`	`\| ^^^ unknown prefix`
`37`	`37`	`\|`
`38`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!`
	`38`	`+ = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`39`	`39`	`= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>`
`40`	`40`	`help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021`
`41`	`41`	`\|`
@@ -48,7 +48,7 @@ warning: prefix `hey` is unknown
`48`	`48`	`LL \| m3!(hey#hey);`
`49`	`49`	`\| ^^^ unknown prefix`
`50`	`50`	`\|`
`51`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!`
	`51`	`+ = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`52`	`52`	`= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>`
`53`	`53`	`help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021`
`54`	`54`	`\|`
@@ -61,7 +61,7 @@ warning: prefix `kind` is unknown
`61`	`61`	`LL \| #name = #kind#value`
`62`	`62`	`\| ^^^^ unknown prefix`
`63`	`63`	`\|`
`64`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2021 edition!`
	`64`	`+ = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021!`
`65`	`65`	`= note: for more information, see issue #84978 <https://github.com/rust-lang/rust/issues/84978>`
`66`	`66`	`help: insert whitespace here to avoid this being parsed as a prefix in Rust 2021`
`67`	`67`	`\|`