Skip to content

rustfmt: Check that a token can begin a nonterminal kind before parsing it as a macro arg #120218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2024
Merged

rustfmt: Check that a token can begin a nonterminal kind before parsing it as a macro arg #120218

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981e8b4
Check that a token can begin a nonterminal kind before parsing it as …
compiler-errors Jan 22, 2024
b93ae21
Do not eagerly recover malformed AST in rustfmt
compiler-errors Jan 22, 2024
5297433
Actually, just use nonterminal_may_begin_with
compiler-errors Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not eagerly recover malformed AST in rustfmt
  • Loading branch information
@compiler-errors
compiler-errors committed Jan 22, 2024
commit b93ae21441eeb466f300efff41f97f1c8b9e0508
2 changes: 1 addition & 1 deletion src/tools/rustfmt/src/parse/macros/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub(crate) mod cfg_if;
pub(crate) mod lazy_static;

fn build_stream_parser<'a>(sess: &'a ParseSess, tokens: TokenStream) -> Parser<'a> {
stream_to_parser(sess, tokens, MACRO_ARGUMENTS)
stream_to_parser(sess, tokens, MACRO_ARGUMENTS).recovery(Recovery::Forbidden)
}

fn build_parser<'a>(context: &RewriteContext<'a>, tokens: TokenStream) -> Parser<'a> {
Expand Down