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.

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

Rollup of 2 pull requests #72524

Merged
merged 7 commits into from
May 24, 2020
Merged

Rollup of 2 pull requests #72524

merged 7 commits into from
May 24, 2020

Commits on May 22, 2020

  1. Configuration menu
    Copy the full SHA
    7a4c186 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2af0218 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    30c00fd View commit details
    Browse the repository at this point in the history
  4. Fix rebase fallout

    Aaron1011 committed May 22, 2020
    Configuration menu
    Copy the full SHA
    5685e4d View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. small select cleanup

    lcnr committed May 23, 2020
    Configuration menu
    Copy the full SHA
    82b4fc4 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Rollup merge of rust-lang#72388 - Aaron1011:fix/deep-tokenstream-equa…

    …lity, r=petrochenkov
    
    Recursively expand `TokenKind::Interpolated` in `probably_equal_for_proc_macro`
    
    Fixes rust-lang#68430
    
    When comparing the captured and re-parsed `TokenStream` for a `TokenKind::Interpolated`, we currently treat any nested `TokenKind::Interpolated` tokens as unequal. If a `TokenKind::Interpolated` token shows up in the captured `TokenStream` due to a `macro_rules!` expansion, we will throw away the captured `TokenStream`, losing span information.
    
    This PR recursively invokes `nt_to_tokenstream` on nested `TokenKind::Interpolated` tokens, effectively flattening the stream into a sequence of non-interpolated tokens. This allows it to compare equal with the re-parsed stream, allowing us to keep the original captured `TokenStream` (with span information).
    
    This requires all of the `probably_equal_for_proc_macro` methods to be moved from `librustc_ast` to `librustc_parse` so that they can call `nt_to_tokenstream`.
    RalfJung authored May 24, 2020
    Configuration menu
    Copy the full SHA
    fb848a6 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#72517 - lcnr:refactor-winnowing, r=jonas-sc…

    …hievink
    
    small select cleanup
    RalfJung authored May 24, 2020
    Configuration menu
    Copy the full SHA
    6cb1c0e View commit details
    Browse the repository at this point in the history