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 3 pull requests #72529

Merged
merged 6 commits into from
May 24, 2020
Merged

Rollup of 3 pull requests #72529

merged 6 commits into from
May 24, 2020

Commits on May 22, 2020

  1. Rewrite Parser::collect_tokens

    The previous implementation did not work when called on an opening
    delimiter, or when called re-entrantly from the same `TokenCursor` stack
    depth.
    Aaron1011 committed May 22, 2020
    Configuration menu
    Copy the full SHA
    52bb09a View commit details
    Browse the repository at this point in the history
  2. Remove macro_defs map

    We store store the `DefId` directly in `ExpnData`. This will allow us to
    serialize `ExpnData` in PR rust-lang#72121 without needing to manage a side
    table.
    Aaron1011 committed May 22, 2020
    Configuration menu
    Copy the full SHA
    d277904 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Fix typo in doc comment.

    call_one_force -> call_once_force
    emosenkis authored May 24, 2020
    Configuration menu
    Copy the full SHA
    806f581 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#72284 - Aaron1011:feature/inline-macro-did,…

    … r=petrochenkov
    
    Remove `macro_defs` map
    
    We now store the `DefId` directly in `ExpnKind::Macro`. This will allow
    us to serialize `ExpnData` in PR rust-lang#72121 without needing to manage a side
    table.
    RalfJung authored May 24, 2020
    Configuration menu
    Copy the full SHA
    94d96b1 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#72393 - Aaron1011:feature/rewrite-collect-t…

    …okens, r=petrochenkov
    
    Rewrite `Parser::collect_tokens`
    
    The previous implementation did not work when called on an opening
    delimiter, or when called re-entrantly from the same `TokenCursor` stack
    depth.
    
    I'm not sure how to test this apart from rust-lang#72287
    RalfJung authored May 24, 2020
    Configuration menu
    Copy the full SHA
    8692c45 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#72528 - emosenkis:patch-1, r=dtolnay

    Fix typo in doc comment.
    
    call_one_force -> call_on**c**e_force
    RalfJung authored May 24, 2020
    Configuration menu
    Copy the full SHA
    e2e3aac View commit details
    Browse the repository at this point in the history