Skip to content

Commit 21aa500

Browse files
borsbors
committed
Auto merge of #129972 - eholk:stabilize-expr_2021, r=compiler-errors,traviscross
Stabilize expr_2021 fragment specifier in all editions This is part of the `expr`/`expr_2021` fragment specifier for Edition 2024 (#123742). The RFC says we can support expr_2021 in as many editions as is practical, and there's nothing particularly hard about supporting it all the way back to 2015. In editions 2021 and earlier, `expr` and `expr_2021` are synonyms. Their behavior diverges starting in Edition 2024. This is checked by the `expr_2021_inline_const.rs` test. cc `@vincenzopalazzo` `@rust-lang/wg-macros` `@traviscross`
2 parents 07f08ff + c7cd55f commit 21aa500

21 files changed

+44
-95
lines changed

Diff for: ‎compiler/rustc_expand/src/mbe/macro_check.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ use rustc_span::symbol::{MacroRulesNormalizedIdent, kw};
119119
use rustc_span::{ErrorGuaranteed, Span};
120120
use smallvec::SmallVec;
121121

122-
use super::quoted::VALID_FRAGMENT_NAMES_MSG_2021;
122+
use super::quoted::VALID_FRAGMENT_NAMES_MSG;
123123
use crate::errors;
124124
use crate::mbe::{KleeneToken, TokenTree};
125125

@@ -274,7 +274,7 @@ fn check_binders(
274274
psess.dcx().emit_err(errors::MissingFragmentSpecifier {
275275
span,
276276
add_span: span.shrink_to_hi(),
277-
valid: VALID_FRAGMENT_NAMES_MSG_2021,
277+
valid: VALID_FRAGMENT_NAMES_MSG,
278278
});
279279
} else {
280280
psess.buffer_lint(

Diff for: ‎compiler/rustc_expand/src/mbe/quoted.rs

+4-34
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use rustc_ast::token::NtExprKind::*;
21
use rustc_ast::token::{self, Delimiter, IdentIsRaw, NonterminalKind, Token};
32
use rustc_ast::{NodeId, tokenstream};
43
use rustc_ast_pretty::pprust;
@@ -13,12 +12,9 @@ use crate::errors;
1312
use crate::mbe::macro_parser::count_metavar_decls;
1413
use crate::mbe::{Delimited, KleeneOp, KleeneToken, MetaVarExpr, SequenceRepetition, TokenTree};
1514

16-
const VALID_FRAGMENT_NAMES_MSG: &str = "valid fragment specifiers are \
17-
`ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, \
18-
`item` and `vis`";
19-
pub(crate) const VALID_FRAGMENT_NAMES_MSG_2021: &str = "valid fragment specifiers are \
20-
`ident`, `block`, `stmt`, `expr`, `expr_2021`, `pat`, `ty`, `lifetime`, `literal`, `path`, \
21-
`meta`, `tt`, `item` and `vis`";
15+
pub(crate) const VALID_FRAGMENT_NAMES_MSG: &str = "valid fragment specifiers are \
16+
`ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, \
17+
`meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility";
2218

2319
/// Takes a `tokenstream::TokenStream` and returns a `Vec<self::TokenTree>`. Specifically, this
2420
/// takes a generic `TokenStream`, such as is used in the rest of the compiler, and returns a
@@ -92,39 +88,13 @@ pub(super) fn parse(
9288
};
9389
let kind = NonterminalKind::from_symbol(fragment.name, edition)
9490
.unwrap_or_else(|| {
95-
let help = match fragment.name {
96-
sym::expr_2021 => {
97-
format!(
98-
"fragment specifier `expr_2021` \
99-
requires Rust 2021 or later\n\
100-
{VALID_FRAGMENT_NAMES_MSG}"
101-
)
102-
}
103-
_ if edition().at_least_rust_2021()
104-
&& features.expr_fragment_specifier_2024 =>
105-
{
106-
VALID_FRAGMENT_NAMES_MSG_2021.into()
107-
}
108-
_ => VALID_FRAGMENT_NAMES_MSG.into(),
109-
};
11091
sess.dcx().emit_err(errors::InvalidFragmentSpecifier {
11192
span,
11293
fragment,
113-
help,
94+
help: VALID_FRAGMENT_NAMES_MSG.into(),
11495
});
11596
NonterminalKind::Ident
11697
});
117-
if kind == NonterminalKind::Expr(Expr2021 { inferred: false })
118-
&& !features.expr_fragment_specifier_2024
119-
{
120-
rustc_session::parse::feature_err(
121-
sess,
122-
sym::expr_fragment_specifier_2024,
123-
span,
124-
"fragment specifier `expr_2021` is unstable",
125-
)
126-
.emit();
127-
}
12898
result.push(TokenTree::MetaVarDecl(span, ident, Some(kind)));
12999
continue;
130100
}

Diff for: ‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ declare_features! (
189189
(accepted, exhaustive_integer_patterns, "1.33.0", Some(50907)),
190190
/// Allows explicit generic arguments specification with `impl Trait` present.
191191
(accepted, explicit_generic_args_with_impl_trait, "1.63.0", Some(83701)),
192+
/// Uses 2024 rules for matching `expr` fragments in macros. Also enables `expr_2021` fragment.
193+
(accepted, expr_fragment_specifier_2024, "CURRENT_RUSTC_VERSION", Some(123742)),
192194
/// Allows arbitrary expressions in key-value attributes at parse time.
193195
(accepted, extended_key_value_attributes, "1.54.0", Some(78835)),
194196
/// Allows resolving absolute paths as paths from other crates.

Diff for: ‎compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,6 @@ declare_features! (
450450
(unstable, exhaustive_patterns, "1.13.0", Some(51085)),
451451
/// Allows explicit tail calls via `become` expression.
452452
(incomplete, explicit_tail_calls, "1.72.0", Some(112788)),
453-
/// Uses 2024 rules for matching `expr` fragments in macros. Also enables `expr_2021` fragment.
454-
(incomplete, expr_fragment_specifier_2024, "1.80.0", Some(123742)),
455453
/// Allows using `efiapi`, `sysv64` and `win64` as calling convention
456454
/// for functions with varargs.
457455
(unstable, extended_varargs_abi_support, "1.65.0", Some(100189)),

Diff for: ‎tests/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: invalid fragment specifier `t_ty`
44
LL | ($wrong:t_ty) => ()
55
| ^^^^^^^^^^^
66
|
7-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
7+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
88

99
error: aborting due to 1 previous error
1010

Diff for: ‎tests/ui/macros/expr_2021.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//@ check-pass
2+
//@ edition: 2015
3+
4+
// Ensures expr_2021 fragment specifier is accepted in old editions
5+
6+
macro_rules! my_macro {
7+
($x:expr_2021) => {
8+
println!("Hello, {}!", $x);
9+
};
10+
}
11+
12+
fn main() {
13+
my_macro!("world");
14+
}

Diff for: ‎tests/ui/macros/expr_2021_cargo_fix_edition.fixed

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//@ run-rustfix
22
//@ check-pass
33
//@ compile-flags: --edition=2021
4-
#![allow(incomplete_features)]
5-
#![feature(expr_fragment_specifier_2024)]
64
#![warn(edition_2024_expr_fragment_specifier)]
75

86
macro_rules! m {

Diff for: ‎tests/ui/macros/expr_2021_cargo_fix_edition.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//@ run-rustfix
22
//@ check-pass
33
//@ compile-flags: --edition=2021
4-
#![allow(incomplete_features)]
5-
#![feature(expr_fragment_specifier_2024)]
64
#![warn(edition_2024_expr_fragment_specifier)]
75

86
macro_rules! m {

Diff for: ‎tests/ui/macros/expr_2021_cargo_fix_edition.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
warning: the `expr` fragment specifier will accept more expressions in the 2024 edition
2-
--> $DIR/expr_2021_cargo_fix_edition.rs:9:9
2+
--> $DIR/expr_2021_cargo_fix_edition.rs:7:9
33
|
44
LL | ($e:expr) => {
55
| ^^^^
66
|
77
= warning: this changes meaning in Rust 2024
88
= note: for more information, see Migration Guide <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/macro-fragment-specifiers.html>
99
note: the lint level is defined here
10-
--> $DIR/expr_2021_cargo_fix_edition.rs:6:9
10+
--> $DIR/expr_2021_cargo_fix_edition.rs:4:9
1111
|
1212
LL | #![warn(edition_2024_expr_fragment_specifier)]
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL | ($e:expr_2021) => {
1717
| ~~~~~~~~~
1818

1919
warning: the `expr` fragment specifier will accept more expressions in the 2024 edition
20-
--> $DIR/expr_2021_cargo_fix_edition.rs:13:11
20+
--> $DIR/expr_2021_cargo_fix_edition.rs:11:11
2121
|
2222
LL | ($($i:expr)*) => { };
2323
| ^^^^

Diff for: ‎tests/ui/macros/expr_2021_inline_const.edi2021.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: no rules expected the token `const`
2-
--> $DIR/expr_2021_inline_const.rs:26:12
2+
--> $DIR/expr_2021_inline_const.rs:23:12
33
|
44
LL | macro_rules! m2021 {
55
| ------------------ when calling this macro
@@ -8,13 +8,13 @@ LL | m2021!(const { 1 });
88
| ^^^^^ no rules expected this token in macro call
99
|
1010
note: while trying to match meta-variable `$e:expr_2021`
11-
--> $DIR/expr_2021_inline_const.rs:10:6
11+
--> $DIR/expr_2021_inline_const.rs:7:6
1212
|
1313
LL | ($e:expr_2021) => {
1414
| ^^^^^^^^^^^^
1515

1616
error: no rules expected the token `const`
17-
--> $DIR/expr_2021_inline_const.rs:27:12
17+
--> $DIR/expr_2021_inline_const.rs:24:12
1818
|
1919
LL | macro_rules! m2024 {
2020
| ------------------ when calling this macro
@@ -23,7 +23,7 @@ LL | m2024!(const { 1 });
2323
| ^^^^^ no rules expected this token in macro call
2424
|
2525
note: while trying to match meta-variable `$e:expr`
26-
--> $DIR/expr_2021_inline_const.rs:16:6
26+
--> $DIR/expr_2021_inline_const.rs:13:6
2727
|
2828
LL | ($e:expr) => {
2929
| ^^^^^^^

Diff for: ‎tests/ui/macros/expr_2021_inline_const.edi2024.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: no rules expected the token `const`
2-
--> $DIR/expr_2021_inline_const.rs:26:12
2+
--> $DIR/expr_2021_inline_const.rs:23:12
33
|
44
LL | macro_rules! m2021 {
55
| ------------------ when calling this macro
@@ -8,7 +8,7 @@ LL | m2021!(const { 1 });
88
| ^^^^^ no rules expected this token in macro call
99
|
1010
note: while trying to match meta-variable `$e:expr_2021`
11-
--> $DIR/expr_2021_inline_const.rs:10:6
11+
--> $DIR/expr_2021_inline_const.rs:7:6
1212
|
1313
LL | ($e:expr_2021) => {
1414
| ^^^^^^^^^^^^

Diff for: ‎tests/ui/macros/expr_2021_inline_const.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
//@[edi2021]compile-flags: --edition=2021
44

55
// This test ensures that the inline const match only on edition 2024
6-
#![feature(expr_fragment_specifier_2024)]
7-
#![allow(incomplete_features)]
8-
96
macro_rules! m2021 {
107
($e:expr_2021) => {
118
$e

Diff for: ‎tests/ui/macros/expr_2024_underscore_expr.edi2021.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: no rules expected the token `_`
2-
--> $DIR/expr_2024_underscore_expr.rs:22:12
2+
--> $DIR/expr_2024_underscore_expr.rs:19:12
33
|
44
LL | macro_rules! m2021 {
55
| ------------------ when calling this macro
@@ -8,13 +8,13 @@ LL | m2021!(_);
88
| ^ no rules expected this token in macro call
99
|
1010
note: while trying to match meta-variable `$e:expr_2021`
11-
--> $DIR/expr_2024_underscore_expr.rs:10:6
11+
--> $DIR/expr_2024_underscore_expr.rs:7:6
1212
|
1313
LL | ($e:expr_2021) => {
1414
| ^^^^^^^^^^^^
1515

1616
error: no rules expected the token `_`
17-
--> $DIR/expr_2024_underscore_expr.rs:23:12
17+
--> $DIR/expr_2024_underscore_expr.rs:20:12
1818
|
1919
LL | macro_rules! m2024 {
2020
| ------------------ when calling this macro
@@ -23,7 +23,7 @@ LL | m2024!(_);
2323
| ^ no rules expected this token in macro call
2424
|
2525
note: while trying to match meta-variable `$e:expr`
26-
--> $DIR/expr_2024_underscore_expr.rs:16:6
26+
--> $DIR/expr_2024_underscore_expr.rs:13:6
2727
|
2828
LL | ($e:expr) => {
2929
| ^^^^^^^

Diff for: ‎tests/ui/macros/expr_2024_underscore_expr.edi2024.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: no rules expected the token `_`
2-
--> $DIR/expr_2024_underscore_expr.rs:22:12
2+
--> $DIR/expr_2024_underscore_expr.rs:19:12
33
|
44
LL | macro_rules! m2021 {
55
| ------------------ when calling this macro
@@ -8,7 +8,7 @@ LL | m2021!(_);
88
| ^ no rules expected this token in macro call
99
|
1010
note: while trying to match meta-variable `$e:expr_2021`
11-
--> $DIR/expr_2024_underscore_expr.rs:10:6
11+
--> $DIR/expr_2024_underscore_expr.rs:7:6
1212
|
1313
LL | ($e:expr_2021) => {
1414
| ^^^^^^^^^^^^

Diff for: ‎tests/ui/macros/expr_2024_underscore_expr.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
//@[edi2021]compile-flags: --edition=2021
44
// This test ensures that the `_` tok is considered an
55
// expression on edition 2024.
6-
#![feature(expr_fragment_specifier_2024)]
7-
#![allow(incomplete_features)]
8-
96
macro_rules! m2021 {
107
($e:expr_2021) => {
118
$e = 1;

Diff for: ‎tests/ui/macros/feature-gate-expr_fragment_specifier_2024.rs

-11
This file was deleted.

Diff for: ‎tests/ui/macros/feature-gate-expr_fragment_specifier_2024.stderr

-13
This file was deleted.

Diff for: ‎tests/ui/macros/invalid-fragment-specifier.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ error: invalid fragment specifier `id`
44
LL | ($wrong:id) => {};
55
| ^^^^^^^^^
66
|
7-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
7+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
88

99
error: invalid fragment specifier `r#if`
1010
--> $DIR/invalid-fragment-specifier.rs:7:6
1111
|
1212
LL | ($wrong:r#if) => {};
1313
| ^^^^^^^^^^^
1414
|
15-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
15+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
1616

1717
error: aborting due to 2 previous errors
1818

Diff for: ‎tests/ui/macros/issue-21356.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: invalid fragment specifier `t_ty`
44
LL | macro_rules! test { ($wrong:t_ty ..) => () }
55
| ^^^^^^^^^^^
66
|
7-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
7+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
88

99
error: aborting due to 1 previous error
1010

Diff for: ‎tests/ui/macros/macro-missing-fragment.e2024.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | ( $( any_token $field_rust_type )* ) => {};
55
| ^^^^^^^^^^^^^^^^
66
|
77
= note: fragment specifiers must be specified in the 2024 edition
8-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `expr_2021`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
8+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
99
help: try adding a specifier here
1010
|
1111
LL | ( $( any_token $field_rust_type:spec )* ) => {};
@@ -18,7 +18,7 @@ LL | ( $name ) => {};
1818
| ^^^^^
1919
|
2020
= note: fragment specifiers must be specified in the 2024 edition
21-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `expr_2021`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
21+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
2222
help: try adding a specifier here
2323
|
2424
LL | ( $name:spec ) => {};
@@ -31,7 +31,7 @@ LL | ( $name ) => {};
3131
| ^^^^^
3232
|
3333
= note: fragment specifiers must be specified in the 2024 edition
34-
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `expr_2021`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`
34+
= help: valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, `pat`, `ty`, `lifetime`, `literal`, `path`, `meta`, `tt`, `item` and `vis`, along with `expr_2021` and `pat_param` for edition compatibility
3535
help: try adding a specifier here
3636
|
3737
LL | ( $name:spec ) => {};

Diff for: ‎tests/ui/macros/metavar_cross_edition_recursive_macros.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// This test captures the behavior of macro-generating-macros with fragment
77
// specifiers across edition boundaries.
88

9-
#![feature(expr_fragment_specifier_2024)]
109
#![feature(macro_metavar_expr)]
1110
#![allow(incomplete_features)]
1211

0 commit comments

Comments
 (0)