bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83384 - mark-i-m:rename-pat2018, r=joshtriplett

Browse source 
rename :pat2018 -> :pat2015

as requested by T-lang on zulip: https://rust-lang.zulipchat.com/#narrow/stream/213817-t-lang/topic/or.20patterns/near/231133873

No functional changes here... just renaming.

r? `@nikomatsakis`
This commit is contained in:
Yuki Okushi 2021-03-23 10:15:43 +09:00 • committed by GitHub
commit 50d048f142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_expand/src/mbe/macro_rules.rs
View file

@ -1080,7 +1080,7 @@ fn is_in_follow(tok: &mbe::TokenTree, kind: NonterminalKind) -> IsInFollow {
_ => IsInFollow::No(TOKENS),
}
}
NonterminalKind::Pat2018 { .. } | NonterminalKind::Pat2021 { .. } => {
NonterminalKind::Pat2015 { .. } | NonterminalKind::Pat2021 { .. } => {
const TOKENS: &[&str] = &["`=>`", "`,`", "`=`", "`|`", "`if`", "`in`"];
match tok {
TokenTree::Token(token) => match token.kind {

4
compiler/rustc_expand/src/mbe/quoted.rs
View file

@ -63,13 +63,13 @@ pub(super) fn parse(
let span = token.span.with_lo(start_sp.lo());
match frag.name {
sym::pat2018 | sym::pat2021 => {
sym::pat2015 | sym::pat2021 => {
if !features.edition_macro_pats {
feature_err(
sess,
sym::edition_macro_pats,
frag.span,
"`pat2018` and `pat2021` are unstable.",
"`pat2015` and `pat2021` are unstable.",
)
.emit();
}