Skip to content

Commit f16ef7d

Browse files
m-ou-sem-ou-se
committed
Add edition 2021.
1 parent 44e3daf commit f16ef7d

File tree

12 files changed

+57
-28
lines changed

12 files changed

+57
-28
lines changed

‎compiler/rustc_parse/src/parser/expr.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use rustc_ast::{AnonConst, BinOp, BinOpKind, FnDecl, FnRetTy, MacCall, Param, Ty
1515
use rustc_ast::{Arm, Async, BlockCheckMode, Expr, ExprKind, Label, Movability, RangeLimits};
1616
use rustc_ast_pretty::pprust;
1717
use rustc_errors::{Applicability, DiagnosticBuilder, PResult};
18+
use rustc_span::edition::LATEST_STABLE_EDITION;
1819
use rustc_span::source_map::{self, Span, Spanned};
1920
use rustc_span::symbol::{kw, sym, Ident, Symbol};
2021
use rustc_span::{BytePos, Pos};
@@ -2108,8 +2109,8 @@ impl<'a> Parser<'a> {
21082109

21092110
let mut async_block_err = |e: &mut DiagnosticBuilder<'_>, span: Span| {
21102111
recover_async = true;
2111-
e.span_label(span, "`async` blocks are only allowed in the 2018 edition");
2112-
e.help("set `edition = \"2018\"` in `Cargo.toml`");
2112+
e.span_label(span, "`async` blocks are only allowed in edition 2018 or later");
2113+
e.help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION));
21132114
e.note("for more on editions, read https://doc.rust-lang.org/edition-guide");
21142115
};
21152116

‎compiler/rustc_parse/src/parser/item.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_ast::{FnHeader, ForeignItem, Path, PathSegment, Visibility, Visibility
1616
use rustc_ast::{MacArgs, MacCall, MacDelimiter};
1717
use rustc_ast_pretty::pprust;
1818
use rustc_errors::{struct_span_err, Applicability, PResult, StashKey};
19-
use rustc_span::edition::Edition;
19+
use rustc_span::edition::{Edition, LATEST_STABLE_EDITION};
2020
use rustc_span::source_map::{self, Span};
2121
use rustc_span::symbol::{kw, sym, Ident, Symbol};
2222

@@ -1668,8 +1668,8 @@ impl<'a> Parser<'a> {
16681668
if span.rust_2015() {
16691669
let diag = self.diagnostic();
16701670
struct_span_err!(diag, span, E0670, "`async fn` is not permitted in the 2015 edition")
1671-
.span_label(span, "to use `async fn`, switch to Rust 2018")
1672-
.help("set `edition = \"2018\"` in `Cargo.toml`")
1671+
.span_label(span, "to use `async fn`, switch to Rust 2018 or later")
1672+
.help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION))
16731673
.note("for more on editions, read https://doc.rust-lang.org/edition-guide")
16741674
.emit();
16751675
}

‎compiler/rustc_session/src/session.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,11 @@ impl Session {
10761076
self.opts.edition >= Edition::Edition2018
10771077
}
10781078

1079+
/// Are we allowed to use features from the Rust 2021 edition?
1080+
pub fn rust_2021(&self) -> bool {
1081+
self.opts.edition >= Edition::Edition2021
1082+
}
1083+
10791084
pub fn edition(&self) -> Edition {
10801085
self.opts.edition
10811086
}

‎compiler/rustc_span/src/edition.rs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,26 @@ pub enum Edition {
2020
Edition2015,
2121
/// The 2018 edition
2222
Edition2018,
23+
/// The 2021 ediiton
24+
Edition2021,
2325
}
2426

2527
// Must be in order from oldest to newest.
26-
pub const ALL_EDITIONS: &[Edition] = &[Edition::Edition2015, Edition::Edition2018];
28+
pub const ALL_EDITIONS: &[Edition] =
29+
&[Edition::Edition2015, Edition::Edition2018, Edition::Edition2021];
2730

28-
pub const EDITION_NAME_LIST: &str = "2015|2018";
31+
pub const EDITION_NAME_LIST: &str = "2015|2018|2021";
2932

3033
pub const DEFAULT_EDITION: Edition = Edition::Edition2015;
3134

35+
pub const LATEST_STABLE_EDITION: Edition = Edition::Edition2018;
36+
3237
impl fmt::Display for Edition {
3338
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
3439
let s = match *self {
3540
Edition::Edition2015 => "2015",
3641
Edition::Edition2018 => "2018",
42+
Edition::Edition2021 => "2021",
3743
};
3844
write!(f, "{}", s)
3945
}
@@ -44,20 +50,23 @@ impl Edition {
4450
match *self {
4551
Edition::Edition2015 => "rust_2015_compatibility",
4652
Edition::Edition2018 => "rust_2018_compatibility",
53+
Edition::Edition2021 => "rust_2021_compatibility",
4754
}
4855
}
4956

5057
pub fn feature_name(&self) -> Symbol {
5158
match *self {
5259
Edition::Edition2015 => sym::rust_2015_preview,
5360
Edition::Edition2018 => sym::rust_2018_preview,
61+
Edition::Edition2021 => sym::rust_2021_preview,
5462
}
5563
}
5664

5765
pub fn is_stable(&self) -> bool {
5866
match *self {
5967
Edition::Edition2015 => true,
6068
Edition::Edition2018 => true,
69+
Edition::Edition2021 => false,
6170
}
6271
}
6372
}
@@ -68,6 +77,7 @@ impl FromStr for Edition {
6877
match s {
6978
"2015" => Ok(Edition::Edition2015),
7079
"2018" => Ok(Edition::Edition2018),
80+
"2021" => Ok(Edition::Edition2021),
7181
_ => Err(()),
7282
}
7383
}

‎compiler/rustc_span/src/lib.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,11 @@ impl Span {
481481
self.edition() >= edition::Edition::Edition2018
482482
}
483483

484+
#[inline]
485+
pub fn rust_2021(&self) -> bool {
486+
self.edition() >= edition::Edition::Edition2021
487+
}
488+
484489
/// Returns the source callee.
485490
///
486491
/// Returns `None` if the supplied span has no expansion trace,

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,7 @@ symbols! {
923923
rust,
924924
rust_2015_preview,
925925
rust_2018_preview,
926+
rust_2021_preview,
926927
rust_begin_unwind,
927928
rust_eh_catch_typeinfo,
928929
rust_eh_personality,

‎compiler/rustc_typeck/src/check/expr.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use rustc_middle::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase};
3838
use rustc_middle::ty::Ty;
3939
use rustc_middle::ty::TypeFoldable;
4040
use rustc_middle::ty::{AdtKind, Visibility};
41+
use rustc_span::edition::LATEST_STABLE_EDITION;
4142
use rustc_span::hygiene::DesugaringKind;
4243
use rustc_span::lev_distance::find_best_match_for_name;
4344
use rustc_span::source_map::Span;
@@ -1637,8 +1638,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
16371638
if field.name == kw::Await {
16381639
// We know by construction that `<expr>.await` is either on Rust 2015
16391640
// or results in `ExprKind::Await`. Suggest switching the edition to 2018.
1640-
err.note("to `.await` a `Future`, switch to Rust 2018");
1641-
err.help("set `edition = \"2018\"` in `Cargo.toml`");
1641+
err.note("to `.await` a `Future`, switch to Rust 2018 or later");
1642+
err.help(&format!("set `edition = \"{}\"` in `Cargo.toml`", LATEST_STABLE_EDITION));
16421643
err.note("for more on editions, read https://doc.rust-lang.org/edition-guide");
16431644
}
16441645

‎src/test/ui/async-await/edition-deny-async-fns-2015.stderr‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
22
--> $DIR/edition-deny-async-fns-2015.rs:3:1
33
|
44
LL | async fn foo() {}
5-
| ^^^^^ to use `async fn`, switch to Rust 2018
5+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
66
|
77
= help: set `edition = "2018"` in `Cargo.toml`
88
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -11,7 +11,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
1111
--> $DIR/edition-deny-async-fns-2015.rs:5:12
1212
|
1313
LL | fn baz() { async fn foo() {} }
14-
| ^^^^^ to use `async fn`, switch to Rust 2018
14+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
1515
|
1616
= help: set `edition = "2018"` in `Cargo.toml`
1717
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -20,7 +20,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
2020
--> $DIR/edition-deny-async-fns-2015.rs:7:1
2121
|
2222
LL | async fn async_baz() {
23-
| ^^^^^ to use `async fn`, switch to Rust 2018
23+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
2424
|
2525
= help: set `edition = "2018"` in `Cargo.toml`
2626
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -29,7 +29,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
2929
--> $DIR/edition-deny-async-fns-2015.rs:8:5
3030
|
3131
LL | async fn bar() {}
32-
| ^^^^^ to use `async fn`, switch to Rust 2018
32+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
3333
|
3434
= help: set `edition = "2018"` in `Cargo.toml`
3535
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -38,7 +38,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
3838
--> $DIR/edition-deny-async-fns-2015.rs:14:5
3939
|
4040
LL | async fn foo() {}
41-
| ^^^^^ to use `async fn`, switch to Rust 2018
41+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
4242
|
4343
= help: set `edition = "2018"` in `Cargo.toml`
4444
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -47,7 +47,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
4747
--> $DIR/edition-deny-async-fns-2015.rs:18:5
4848
|
4949
LL | async fn foo() {}
50-
| ^^^^^ to use `async fn`, switch to Rust 2018
50+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
5151
|
5252
= help: set `edition = "2018"` in `Cargo.toml`
5353
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -56,7 +56,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
5656
--> $DIR/edition-deny-async-fns-2015.rs:36:9
5757
|
5858
LL | async fn bar() {}
59-
| ^^^^^ to use `async fn`, switch to Rust 2018
59+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
6060
|
6161
= help: set `edition = "2018"` in `Cargo.toml`
6262
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -65,7 +65,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
6565
--> $DIR/edition-deny-async-fns-2015.rs:26:9
6666
|
6767
LL | async fn foo() {}
68-
| ^^^^^ to use `async fn`, switch to Rust 2018
68+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
6969
|
7070
= help: set `edition = "2018"` in `Cargo.toml`
7171
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
@@ -74,7 +74,7 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
7474
--> $DIR/edition-deny-async-fns-2015.rs:31:13
7575
|
7676
LL | async fn bar() {}
77-
| ^^^^^ to use `async fn`, switch to Rust 2018
77+
| ^^^^^ to use `async fn`, switch to Rust 2018 or later
7878
|
7979
= help: set `edition = "2018"` in `Cargo.toml`
8080
= note: for more on editions, read https://doc.rust-lang.org/edition-guide

‎src/test/ui/async-await/suggest-switching-edition-on-await.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0609]: no field `await` on type `await_on_struct_missing::S`
44
LL | x.await;
55
| ^^^^^ unknown field
66
|
7-
= note: to `.await` a `Future`, switch to Rust 2018
7+
= note: to `.await` a `Future`, switch to Rust 2018 or later
88
= help: set `edition = "2018"` in `Cargo.toml`
99
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
1010

@@ -14,7 +14,7 @@ error[E0609]: no field `await` on type `await_on_struct_similar::S`
1414
LL | x.await;
1515
| ^^^^^ help: a field with a similar name exists: `awai`
1616
|
17-
= note: to `.await` a `Future`, switch to Rust 2018
17+
= note: to `.await` a `Future`, switch to Rust 2018 or later
1818
= help: set `edition = "2018"` in `Cargo.toml`
1919
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
2020

@@ -24,7 +24,7 @@ error[E0609]: no field `await` on type `Pin<&mut dyn Future<Output = ()>>`
2424
LL | x.await;
2525
| ^^^^^ unknown field
2626
|
27-
= note: to `.await` a `Future`, switch to Rust 2018
27+
= note: to `.await` a `Future`, switch to Rust 2018 or later
2828
= help: set `edition = "2018"` in `Cargo.toml`
2929
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
3030

@@ -34,7 +34,7 @@ error[E0609]: no field `await` on type `impl Future<Output = ()>`
3434
LL | x.await;
3535
| ^^^^^
3636
|
37-
= note: to `.await` a `Future`, switch to Rust 2018
37+
= note: to `.await` a `Future`, switch to Rust 2018 or later
3838
= help: set `edition = "2018"` in `Cargo.toml`
3939
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
4040

‎src/test/ui/editions/async-block-2015.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
async fn foo() {
22
//~^ ERROR `async fn` is not permitted in the 2015 edition
3-
//~| NOTE to use `async fn`, switch to Rust 2018
3+
//~| NOTE to use `async fn`, switch to Rust 2018 or later
44
//~| HELP set `edition = "2018"` in `Cargo.toml`
55
//~| NOTE for more on editions, read https://doc.rust-lang.org/edition-guide
66

77
let x = async {};
88
//~^ ERROR cannot find struct, variant or union type `async` in this scope
99
//~| NOTE `async` blocks are only allowed in the 2018 edition
10-
let y = async { //~ NOTE `async` blocks are only allowed in the 2018 edition
10+
let y = async { //~ NOTE `async` blocks are only allowed in edition 2018 or later
1111
let x = 42;
1212
//~^ ERROR expected identifier, found keyword `let`
1313
//~| NOTE expected identifier, found keyword
1414
//~| HELP set `edition = "2018"` in `Cargo.toml`
1515
//~| NOTE for more on editions, read https://doc.rust-lang.org/edition-guide
1616
42
1717
};
18-
let z = async { //~ NOTE `async` blocks are only allowed in the 2018 edition
18+
let z = async { //~ NOTE `async` blocks are only allowed in edition 2018 or later
1919
42
2020
//~^ ERROR expected identifier, found `42`
2121
//~| NOTE expected identifier

0 commit comments

Comments
 (0)