Skip to content

Commit 2a9db91

Browse files
mark-i-mmark-i-m
committed
remove pat2021
1 parent 3f7b98e commit 2a9db91

14 files changed

+35
-80
lines changed

‎compiler/rustc_ast/src/token.rs

+3-10
Original file line numberDiff line numberDiff line change
@@ -693,11 +693,7 @@ pub enum NonterminalKind {
693693
/// edition of the span. This is used for diagnostics.
694694
inferred: bool,
695695
},
696-
Pat2021 {
697-
/// Keep track of whether the user used `:pat_param` or `:pat` and we inferred it from the
698-
/// edition of the span. This is used for diagnostics.
699-
inferred: bool,
700-
},
696+
PatWithOr,
701697
Expr,
702698
Ty,
703699
Ident,
@@ -724,10 +720,9 @@ impl NonterminalKind {
724720
Edition::Edition2015 | Edition::Edition2018 => {
725721
NonterminalKind::PatParam { inferred: true }
726722
}
727-
Edition::Edition2021 => NonterminalKind::Pat2021 { inferred: true },
723+
Edition::Edition2021 => NonterminalKind::PatWithOr,
728724
},
729725
sym::pat_param => NonterminalKind::PatParam { inferred: false },
730-
sym::pat2021 => NonterminalKind::Pat2021 { inferred: false },
731726
sym::expr => NonterminalKind::Expr,
732727
sym::ty => NonterminalKind::Ty,
733728
sym::ident => NonterminalKind::Ident,
@@ -746,9 +741,7 @@ impl NonterminalKind {
746741
NonterminalKind::Block => sym::block,
747742
NonterminalKind::Stmt => sym::stmt,
748743
NonterminalKind::PatParam { inferred: false } => sym::pat_param,
749-
NonterminalKind::Pat2021 { inferred: false } => sym::pat2021,
750-
NonterminalKind::PatParam { inferred: true }
751-
| NonterminalKind::Pat2021 { inferred: true } => sym::pat,
744+
NonterminalKind::PatParam { inferred: true } | NonterminalKind::PatWithOr => sym::pat,
752745
NonterminalKind::Expr => sym::expr,
753746
NonterminalKind::Ty => sym::ty,
754747
NonterminalKind::Ident => sym::ident,

‎compiler/rustc_expand/src/mbe/macro_rules.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ fn is_in_follow(tok: &mbe::TokenTree, kind: NonterminalKind) -> IsInFollow {
11161116
_ => IsInFollow::No(TOKENS),
11171117
}
11181118
}
1119-
NonterminalKind::Pat2021 { .. } => {
1119+
NonterminalKind::PatWithOr { .. } => {
11201120
const TOKENS: &[&str] = &["`=>`", "`,`", "`=`", "`if`", "`in`"];
11211121
match tok {
11221122
TokenTree::Token(token) => match token.kind {

‎compiler/rustc_expand/src/mbe/quoted.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use rustc_ast::tokenstream;
66
use rustc_ast::{NodeId, DUMMY_NODE_ID};
77
use rustc_ast_pretty::pprust;
88
use rustc_feature::Features;
9-
use rustc_session::parse::{feature_err, ParseSess};
10-
use rustc_span::symbol::{kw, sym, Ident};
9+
use rustc_session::parse::ParseSess;
10+
use rustc_span::symbol::{kw, Ident};
1111

1212
use rustc_span::Span;
1313

@@ -62,18 +62,6 @@ pub(super) fn parse(
6262
Some((frag, _)) => {
6363
let span = token.span.with_lo(start_sp.lo());
6464

65-
if matches!(frag.name, sym::pat2021)
66-
&& !features.edition_macro_pats
67-
{
68-
feature_err(
69-
sess,
70-
sym::edition_macro_pats,
71-
frag.span,
72-
"`pat2021` is unstable.",
73-
)
74-
.emit();
75-
}
76-
7765
let kind =
7866
token::NonterminalKind::from_symbol(frag.name, || {
7967
span.edition()

‎compiler/rustc_feature/src/active.rs

-3
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,6 @@ declare_features! (
609609
/// Allows arbitrary expressions in key-value attributes at parse time.
610610
(active, extended_key_value_attributes, "1.50.0", Some(78835), None),
611611

612-
/// `:pat2021` macro matcher.
613-
(active, edition_macro_pats, "1.51.0", Some(54883), None),
614-
615612
/// Allows const generics to have default values (e.g. `struct Foo<const N: usize = 3>(...);`).
616613
(active, const_generics_defaults, "1.51.0", Some(44580), None),
617614

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'a> Parser<'a> {
6161
},
6262
_ => false,
6363
},
64-
NonterminalKind::PatParam { .. } | NonterminalKind::Pat2021 { .. } => {
64+
NonterminalKind::PatParam { .. } | NonterminalKind::PatWithOr { .. } => {
6565
match token.kind {
6666
token::Ident(..) | // box, ref, mut, and other identifiers (can stricten)
6767
token::OpenDelim(token::Paren) | // tuple pattern
@@ -76,7 +76,7 @@ impl<'a> Parser<'a> {
7676
token::Lt | // path (UFCS constant)
7777
token::BinOp(token::Shl) => true, // path (double UFCS)
7878
// leading vert `|` or-pattern
79-
token::BinOp(token::Or) => matches!(kind, NonterminalKind::Pat2021 {..}),
79+
token::BinOp(token::Or) => matches!(kind, NonterminalKind::PatWithOr {..}),
8080
token::Interpolated(ref nt) => may_be_ident(nt),
8181
_ => false,
8282
}
@@ -120,10 +120,10 @@ impl<'a> Parser<'a> {
120120
return Err(self.struct_span_err(self.token.span, "expected a statement"));
121121
}
122122
},
123-
NonterminalKind::PatParam { .. } | NonterminalKind::Pat2021 { .. } => {
123+
NonterminalKind::PatParam { .. } | NonterminalKind::PatWithOr { .. } => {
124124
token::NtPat(self.collect_tokens_no_attrs(|this| match kind {
125125
NonterminalKind::PatParam { .. } => this.parse_pat_no_top_alt(None),
126-
NonterminalKind::Pat2021 { .. } => {
126+
NonterminalKind::PatWithOr { .. } => {
127127
this.parse_pat_allow_top_alt(None, RecoverComma::No)
128128
}
129129
_ => unreachable!(),

‎compiler/rustc_span/src/symbol.rs

-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,6 @@ symbols! {
849849
partial_ord,
850850
passes,
851851
pat,
852-
pat2021,
853852
pat_param,
854853
path,
855854
pattern_parentheses,

‎src/test/ui/feature-gates/feature-gate-edition_macro_pats.rs

-8
This file was deleted.

‎src/test/ui/feature-gates/feature-gate-edition_macro_pats.stderr

-12
This file was deleted.

‎src/test/ui/macros/edition-macro-pats.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// run-pass
2-
3-
#![feature(edition_macro_pats)]
2+
// edition:2021
43

54
macro_rules! foo {
65
(a $x:pat_param) => {};
7-
(b $x:pat2021) => {};
6+
(b $x:pat) => {};
87
}
98

109
fn main() {

‎src/test/ui/macros/macro-or-patterns-back-compat.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-rustfix
22

3-
#![feature(edition_macro_pats)]
43
#![deny(or_patterns_back_compat)]
54
#![allow(unused_macros)]
65
macro_rules! foo { ($x:pat_param | $y:pat) => {} } //~ ERROR the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro

‎src/test/ui/macros/macro-or-patterns-back-compat.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-rustfix
22

3-
#![feature(edition_macro_pats)]
43
#![deny(or_patterns_back_compat)]
54
#![allow(unused_macros)]
65
macro_rules! foo { ($x:pat | $y:pat) => {} } //~ ERROR the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro

‎src/test/ui/macros/macro-or-patterns-back-compat.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error: the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
2-
--> $DIR/macro-or-patterns-back-compat.rs:6:21
2+
--> $DIR/macro-or-patterns-back-compat.rs:5:21
33
|
44
LL | macro_rules! foo { ($x:pat | $y:pat) => {} }
55
| ^^^^^^ help: use pat_param to preserve semantics: `$x:pat_param`
66
|
77
note: the lint level is defined here
8-
--> $DIR/macro-or-patterns-back-compat.rs:4:9
8+
--> $DIR/macro-or-patterns-back-compat.rs:3:9
99
|
1010
LL | #![deny(or_patterns_back_compat)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
14-
--> $DIR/macro-or-patterns-back-compat.rs:7:23
14+
--> $DIR/macro-or-patterns-back-compat.rs:6:23
1515
|
1616
LL | macro_rules! bar { ($($x:pat)+ | $($y:pat)+) => {} }
1717
| ^^^^^^ help: use pat_param to preserve semantics: `$x:pat_param`
1818

1919
error: the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
20-
--> $DIR/macro-or-patterns-back-compat.rs:10:21
20+
--> $DIR/macro-or-patterns-back-compat.rs:9:21
2121
|
2222
LL | macro_rules! ogg { ($x:pat | $y:pat_param) => {} }
2323
| ^^^^^^ help: use pat_param to preserve semantics: `$x:pat_param`
2424

2525
error: the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
26-
--> $DIR/macro-or-patterns-back-compat.rs:12:26
26+
--> $DIR/macro-or-patterns-back-compat.rs:11:26
2727
|
2828
LL | ( $expr:expr , $( $( $pat:pat )|+ => $expr_arm:expr ),+ ) => {
2929
| ^^^^^^^^ help: use pat_param to preserve semantics: `$pat:pat_param`

‎src/test/ui/macros/macro-pat2021-pattern-followed-by-or.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
#![feature(edition_macro_pats)]
1+
// edition:2021
2+
23
#![allow(unused_macros)]
3-
macro_rules! foo { ($x:pat2021 | $y:pat2021) => {} } //~ ERROR `$x:pat2021` is followed by `|`, which is not allowed for `pat2021` fragments
4+
macro_rules! foo { ($x:pat | $y:pat) => {} } //~ ERROR `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
45
macro_rules! baz { ($x:pat_param | $y:pat_param) => {} } // should be ok
5-
macro_rules! qux { ($x:pat_param | $y:pat2021) => {} } // should be ok
6-
macro_rules! ogg { ($x:pat2021 | $y:pat_param) => {} } //~ ERROR `$x:pat2021` is followed by `|`, which is not allowed for `pat2021` fragments
6+
macro_rules! qux { ($x:pat_param | $y:pat) => {} } // should be ok
7+
macro_rules! ogg { ($x:pat | $y:pat_param) => {} } //~ ERROR `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
78
macro_rules! match_any {
8-
( $expr:expr , $( $( $pat:pat2021 )|+ => $expr_arm:pat2021 ),+ ) => { //~ ERROR `$pat:pat2021` may be followed by `|`, which is not allowed for `pat2021` fragments
9+
( $expr:expr , $( $( $pat:pat)|+ => $expr_arm:pat),+ ) => { //~ ERROR `$pat:pat` may be followed by `|`, which is not allowed for `pat` fragments
910
match $expr {
1011
$(
1112
$( $pat => $expr_arm, )+

‎src/test/ui/macros/macro-pat2021-pattern-followed-by-or.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
error: `$x:pat2021` is followed by `|`, which is not allowed for `pat2021` fragments
2-
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:3:32
1+
error: `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
2+
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:4:28
33
|
4-
LL | macro_rules! foo { ($x:pat2021 | $y:pat2021) => {} }
5-
| ^ not allowed after `pat2021` fragments
4+
LL | macro_rules! foo { ($x:pat | $y:pat) => {} }
5+
| ^ not allowed after `pat` fragments
66
|
77
= note: allowed there are: `=>`, `,`, `=`, `if` or `in`
88

9-
error: `$x:pat2021` is followed by `|`, which is not allowed for `pat2021` fragments
10-
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:6:32
9+
error: `$x:pat` is followed by `|`, which is not allowed for `pat` fragments
10+
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:7:28
1111
|
12-
LL | macro_rules! ogg { ($x:pat2021 | $y:pat_param) => {} }
13-
| ^ not allowed after `pat2021` fragments
12+
LL | macro_rules! ogg { ($x:pat | $y:pat_param) => {} }
13+
| ^ not allowed after `pat` fragments
1414
|
1515
= note: allowed there are: `=>`, `,`, `=`, `if` or `in`
1616

17-
error: `$pat:pat2021` may be followed by `|`, which is not allowed for `pat2021` fragments
18-
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:8:40
17+
error: `$pat:pat` may be followed by `|`, which is not allowed for `pat` fragments
18+
--> $DIR/macro-pat2021-pattern-followed-by-or.rs:9:35
1919
|
20-
LL | ( $expr:expr , $( $( $pat:pat2021 )|+ => $expr_arm:pat2021 ),+ ) => {
21-
| ^ not allowed after `pat2021` fragments
20+
LL | ( $expr:expr , $( $( $pat:pat)|+ => $expr_arm:pat),+ ) => {
21+
| ^ not allowed after `pat` fragments
2222
|
2323
= note: allowed there are: `=>`, `,`, `=`, `if` or `in`
2424

0 commit comments

Comments
 (0)