bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #91385 - ecstatic-morse:pat-param-spec-suggest, r=estebank

Browse source 
Suggest the `pat_param` specifier before `|` on 2021 edition

Ran into this today after writing some Rust for the first time in a while.

r? `@estebank`
This commit is contained in:
Matthias Krüger 2021-12-04 02:26:23 +01:00 • committed by GitHub
commit 2b64476b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1027,6 +1027,24 @@ fn check_matcher_core(
),
);
err.span_label(sp, format!("not allowed after `{}` fragments", kind));
if kind == NonterminalKind::PatWithOr
&& sess.edition == Edition::Edition2021
&& next_token.is_token(&BinOp(token::BinOpToken::Or))
{
let suggestion = quoted_tt_to_string(&TokenTree::MetaVarDecl(
span,
name,
Some(NonterminalKind::PatParam { inferred: false }),
));
err.span_suggestion(
span,
&format!("try a `pat_param` fragment specifier instead"),
suggestion,
Applicability::MaybeIncorrect,
);
}
let msg = "allowed there are: ";
match possible {
&[] => {}