Consistently call editions "Rust 20xx" in messages.

m-ou-se · m-ou-se · commit c574ded57da4 · 2020-12-31T19:06:09.000+01:00
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
@@ -2109,7 +2109,7 @@ impl<'a> Parser<'a> {
 
         let mut async_block_err = |e: &mut DiagnosticBuilder<'_>, span: Span| {
             recover_async = true;
-            e.span_label(span, "`async` blocks are only allowed in edition 2018 or later");
+            e.span_label(span, "`async` blocks are only allowed in Rust 2018 or later");
             e.help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION));
             e.note("for more on editions, read https://doc.rust-lang.org/edition-guide");
         };
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1667,7 +1667,7 @@ impl<'a> Parser<'a> {
     fn ban_async_in_2015(&self, span: Span) {
         if span.rust_2015() {
             let diag = self.diagnostic();
-            struct_span_err!(diag, span, E0670, "`async fn` is not permitted in the 2015 edition")
+            struct_span_err!(diag, span, E0670, "`async fn` is not permitted in Rust 2015")
                 .span_label(span, "to use `async fn`, switch to Rust 2018 or later")
                 .help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION))
                 .note("for more on editions, read https://doc.rust-lang.org/edition-guide")
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -180,7 +180,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
             (
                 format!("cannot find {} `{}` in {}{}", expected, item_str, mod_prefix, mod_str),
                 if path_str == "async" && expected.starts_with("struct") {
-                    "`async` blocks are only allowed in the 2018 edition".to_string()
+                    "`async` blocks are only allowed in Rust 2018 or later".to_string()
                 } else {
                     format!("not found in {}", mod_str)
                 },
@@ -904,7 +904,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
                     Applicability::MaybeIncorrect,
                 );
                 if path_str == "try" && span.rust_2015() {
-                    err.note("if you want the `try` keyword, you need to be in the 2018 edition");
+                    err.note("if you want the `try` keyword, you need Rust 2018 or later");
                 }
             }
             (Res::Def(DefKind::TyAlias, def_id), PathSource::Trait(_)) => {
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.rs b/src/test/ui/async-await/edition-deny-async-fns-2015.rs
@@ -1,38 +1,38 @@
 // edition:2015
 
-async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
 
-fn baz() { async fn foo() {} } //~ ERROR `async fn` is not permitted in the 2015 edition
+fn baz() { async fn foo() {} } //~ ERROR `async fn` is not permitted in Rust 2015
 
-async fn async_baz() { //~ ERROR `async fn` is not permitted in the 2015 edition
-    async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+async fn async_baz() { //~ ERROR `async fn` is not permitted in Rust 2015
+    async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
 }
 
 struct Foo {}
 
 impl Foo {
-    async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+    async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
 }
 
 trait Bar {
-    async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+    async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
                       //~^ ERROR functions in traits cannot be declared `async`
 }
 
 fn main() {
     macro_rules! accept_item { ($x:item) => {} }
 
     accept_item! {
-        async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+        async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
     }
 
     accept_item! {
         impl Foo {
-            async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+            async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
         }
     }
 
     let inside_closure = || {
-        async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
+        async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
     };
 }
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr b/src/test/ui/async-await/edition-deny-async-fns-2015.stderr
@@ -1,4 +1,4 @@
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:3:1
    |
 LL | async fn foo() {}
@@ -7,7 +7,7 @@ LL | async fn foo() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:5:12
    |
 LL | fn baz() { async fn foo() {} }
@@ -16,7 +16,7 @@ LL | fn baz() { async fn foo() {} }
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:7:1
    |
 LL | async fn async_baz() {
@@ -25,7 +25,7 @@ LL | async fn async_baz() {
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:8:5
    |
 LL |     async fn bar() {}
@@ -34,7 +34,7 @@ LL |     async fn bar() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:14:5
    |
 LL |     async fn foo() {}
@@ -43,7 +43,7 @@ LL |     async fn foo() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:18:5
    |
 LL |     async fn foo() {}
@@ -52,7 +52,7 @@ LL |     async fn foo() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:36:9
    |
 LL |         async fn bar() {}
@@ -61,7 +61,7 @@ LL |         async fn bar() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:26:9
    |
 LL |         async fn foo() {}
@@ -70,7 +70,7 @@ LL |         async fn foo() {}
    = help: set `edition = "2018"` in `Cargo.toml`
    = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/edition-deny-async-fns-2015.rs:31:13
    |
 LL |             async fn bar() {}
diff --git a/src/test/ui/editions/async-block-2015.rs b/src/test/ui/editions/async-block-2015.rs
@@ -1,21 +1,21 @@
 async fn foo() {
-//~^ ERROR `async fn` is not permitted in the 2015 edition
+//~^ ERROR `async fn` is not permitted in Rust 2015
 //~| NOTE to use `async fn`, switch to Rust 2018 or later
 //~| HELP set `edition = "2018"` in `Cargo.toml`
 //~| NOTE for more on editions, read https://doc.rust-lang.org/edition-guide
 
     let x = async {};
     //~^ ERROR cannot find struct, variant or union type `async` in this scope
-    //~| NOTE `async` blocks are only allowed in the 2018 edition
-    let y = async { //~ NOTE `async` blocks are only allowed in edition 2018 or later
+    //~| NOTE `async` blocks are only allowed in Rust 2018 or later
+    let y = async { //~ NOTE `async` blocks are only allowed in Rust 2018 or later
         let x = 42;
         //~^ ERROR expected identifier, found keyword `let`
         //~| NOTE expected identifier, found keyword
         //~| HELP set `edition = "2018"` in `Cargo.toml`
         //~| NOTE for more on editions, read https://doc.rust-lang.org/edition-guide
         42
     };
-    let z = async { //~ NOTE `async` blocks are only allowed in edition 2018 or later
+    let z = async { //~ NOTE `async` blocks are only allowed in Rust 2018 or later
         42
         //~^ ERROR expected identifier, found `42`
         //~| NOTE expected identifier
diff --git a/src/test/ui/editions/async-block-2015.stderr b/src/test/ui/editions/async-block-2015.stderr
@@ -1,4 +1,4 @@
-error[E0670]: `async fn` is not permitted in the 2015 edition
+error[E0670]: `async fn` is not permitted in Rust 2015
   --> $DIR/async-block-2015.rs:1:1
    |
 LL | async fn foo() {
@@ -11,7 +11,7 @@ error: expected identifier, found keyword `let`
   --> $DIR/async-block-2015.rs:11:9
    |
 LL |     let y = async {
-   |             ----- `async` blocks are only allowed in edition 2018 or later
+   |             ----- `async` blocks are only allowed in Rust 2018 or later
 LL |         let x = 42;
    |         ^^^ expected identifier, found keyword
    |
@@ -22,7 +22,7 @@ error: expected identifier, found `42`
   --> $DIR/async-block-2015.rs:19:9
    |
 LL |     let z = async {
-   |             ----- `async` blocks are only allowed in edition 2018 or later
+   |             ----- `async` blocks are only allowed in Rust 2018 or later
 LL |         42
    |         ^^ expected identifier
    |
@@ -33,7 +33,7 @@ error[E0422]: cannot find struct, variant or union type `async` in this scope
   --> $DIR/async-block-2015.rs:7:13
    |
 LL |     let x = async {};
-   |             ^^^^^ `async` blocks are only allowed in the 2018 edition
+   |             ^^^^^ `async` blocks are only allowed in Rust 2018 or later
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/try-block/try-block-in-edition2015.stderr b/src/test/ui/try-block/try-block-in-edition2015.stderr
@@ -13,7 +13,7 @@ error[E0574]: expected struct, variant or union type, found macro `try`
 LL |     let try_result: Option<_> = try {
    |                                 ^^^ not a struct, variant or union type
    |
-   = note: if you want the `try` keyword, you need to be in the 2018 edition
+   = note: if you want the `try` keyword, you need Rust 2018 or later
 help: use `!` to invoke the macro
    |
 LL |     let try_result: Option<_> = try! {

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {`
`180`	`180`	`(`
`181`	`181`	format!("cannot find {} `{}` in {}{}", expected, item_str, mod_prefix, mod_str),
`182`	`182`	`if path_str == "async" && expected.starts_with("struct") {`
`183`		- "`async` blocks are only allowed in the 2018 edition".to_string()
	`183`	+ "`async` blocks are only allowed in Rust 2018 or later".to_string()
`184`	`184`	`} else {`
`185`	`185`	`format!("not found in {}", mod_str)`
`186`	`186`	`},`
`@@ -904,7 +904,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {`
`904`	`904`	`Applicability::MaybeIncorrect,`
`905`	`905`	`);`
`906`	`906`	`if path_str == "try" && span.rust_2015() {`
`907`		- err.note("if you want the `try` keyword, you need to be in the 2018 edition");
	`907`	+ err.note("if you want the `try` keyword, you need Rust 2018 or later");
`908`	`908`	`}`
`909`	`909`	`}`
`910`	`910`	`(Res::Def(DefKind::TyAlias, def_id), PathSource::Trait(_)) => {`
Original file line number	Diff line number	Diff line change
`@@ -1,38 +1,38 @@`
`1`	`1`	`// edition:2015`
`2`	`2`
`3`		-async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`3`	+async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
`4`	`4`
`5`		-fn baz() { async fn foo() {} } //~ ERROR `async fn` is not permitted in the 2015 edition
	`5`	+fn baz() { async fn foo() {} } //~ ERROR `async fn` is not permitted in Rust 2015
`6`	`6`
`7`		-async fn async_baz() { //~ ERROR `async fn` is not permitted in the 2015 edition
`8`		- async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`7`	+async fn async_baz() { //~ ERROR `async fn` is not permitted in Rust 2015
	`8`	+ async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`struct Foo {}`
`12`	`12`
`13`	`13`	`impl Foo {`
`14`		- async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`14`	+ async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`trait Bar {`
`18`		- async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`18`	+ async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
`19`	`19`	//~^ ERROR functions in traits cannot be declared `async`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`fn main() {`
`23`	`23`	`macro_rules! accept_item { ($x:item) => {} }`
`24`	`24`
`25`	`25`	`accept_item! {`
`26`		- async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`26`	+ async fn foo() {} //~ ERROR `async fn` is not permitted in Rust 2015
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`accept_item! {`
`30`	`30`	`impl Foo {`
`31`		- async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`31`	+ async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`let inside_closure = \|\| {`
`36`		- async fn bar() {} //~ ERROR `async fn` is not permitted in the 2015 edition
	`36`	+ async fn bar() {} //~ ERROR `async fn` is not permitted in Rust 2015
`37`	`37`	`};`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-error[E0670]: `async fn` is not permitted in the 2015 edition
	`1`	+error[E0670]: `async fn` is not permitted in Rust 2015
`2`	`2`	`--> $DIR/async-block-2015.rs:1:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| async fn foo() {`
@@ -11,7 +11,7 @@ error: expected identifier, found keyword `let`
`11`	`11`	`--> $DIR/async-block-2015.rs:11:9`
`12`	`12`	`\|`
`13`	`13`	`LL \| let y = async {`
`14`		- \| ----- `async` blocks are only allowed in edition 2018 or later
	`14`	+ \| ----- `async` blocks are only allowed in Rust 2018 or later
`15`	`15`	`LL \| let x = 42;`
`16`	`16`	`\| ^^^ expected identifier, found keyword`
`17`	`17`	`\|`
@@ -22,7 +22,7 @@ error: expected identifier, found `42`
`22`	`22`	`--> $DIR/async-block-2015.rs:19:9`
`23`	`23`	`\|`
`24`	`24`	`LL \| let z = async {`
`25`		- \| ----- `async` blocks are only allowed in edition 2018 or later
	`25`	+ \| ----- `async` blocks are only allowed in Rust 2018 or later
`26`	`26`	`LL \| 42`
`27`	`27`	`\| ^^ expected identifier`
`28`	`28`	`\|`
@@ -33,7 +33,7 @@ error[E0422]: cannot find struct, variant or union type `async` in this scope
`33`	`33`	`--> $DIR/async-block-2015.rs:7:13`
`34`	`34`	`\|`
`35`	`35`	`LL \| let x = async {};`
`36`		- \| ^^^^^ `async` blocks are only allowed in the 2018 edition
	`36`	+ \| ^^^^^ `async` blocks are only allowed in Rust 2018 or later
`37`	`37`
`38`	`38`	`error: aborting due to 4 previous errors`
`39`	`39`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ error[E0574]: expected struct, variant or union type, found macro `try`
`13`	`13`	`LL \| let try_result: Option<_> = try {`
`14`	`14`	`\| ^^^ not a struct, variant or union type`
`15`	`15`	`\|`
`16`		- = note: if you want the `try` keyword, you need to be in the 2018 edition
	`16`	+ = note: if you want the `try` keyword, you need Rust 2018 or later
`17`	`17`	help: use `!` to invoke the macro
`18`	`18`	`\|`
`19`	`19`	`LL \| let try_result: Option<_> = try! {`