Skip to content
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

Jump to bottom

Handle macro_rules! tokens consistently across crates #73569

Merged
merged 3 commits into from
Jul 2, 2020
Merged

Handle macro_rules! tokens consistently across crates #73569

merged 3 commits into from
Jul 2, 2020

Commits on Jul 1, 2020

  1. Insert NoDelim groups around nonterminals when lowering macro_rules

    @Aaron1011
    Aaron1011 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    5da0576 View commit details
    Browse the repository at this point in the history

  2. Don't print additional spaces when pretty-printing NoDelim groups

    @Aaron1011
    Aaron1011 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    c844028 View commit details
    Browse the repository at this point in the history

  3. Handle None-delimited groups when parsing macro_rules! macro 

    When a `macro_rules!` macro expands to another `macro_rules!` macro, we
may see `None`-delimited groups in odd places when another crate
deserializes the 'inner' macro. This commit 'unwraps' an outer
`None`-delimited group to avoid breaking existing code.

See rust-lang#73569 (comment)
for more details.

The proper fix is to handle `None`-delimited groups systematically
throughout the parser, but that will require significant work. In the
meantime, this hack lets us fix important hygiene bugs in macros
    @Aaron1011
    Aaron1011 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    1ded7a5 View commit details
    Browse the repository at this point in the history