Force token collection to run when parsing nonterminals#81177
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 22, 2021
Merged
Force token collection to run when parsing nonterminals#81177bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Contributor
Author
Contributor
Author
|
@bors try @rust-timer queue |
Collaborator
|
Awaiting bors try build completion. |
Collaborator
|
⌛ Trying commit 63029c0da16ceb7c3f3b3234843144507eb584cb with merge 56b25a6a8cfe3ac5ad688f533bd0745e4436acd0... |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Contributor
Author
|
@petrochenkov This is now ready for review |
estebank
reviewed
Jan 20, 2021
Contributor
|
Could you turn |
petrochenkov
added
S-waiting-on-author
Fixes rust-lang#81007 Previously, we would fail to collect tokens in the proper place when only builtin attributes were present. As a result, we would end up with attribute tokens in the collected `TokenStream`, leading to duplication when we attempted to prepend the attributes from the AST node. We now explicitly track when token collection must be performed due to nomterminal parsing.
Aaron1011
force-pushed
the
fix/force-capture-tokens
branch
from
c324e90 to
11b1e37
Compare
Contributor
Author
|
@bors r=petrochenkov |
Collaborator
|
📌 Commit 11b1e37 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
This was referenced Jan 22, 2021
Xiretza
added a commit
to Xiretza/rust
that referenced
this pull request
Aug 17, 2022
…recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 17, 2022
…docs, r=davidtwco Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 17, 2022
…docs, r=davidtwco Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 18, 2022
…docs, r=davidtwco Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #81007
Previously, we would fail to collect tokens in the proper place when
only builtin attributes were present. As a result, we would end up with
attribute tokens in the collected
TokenStream, leading to duplicationwhen we attempted to prepend the attributes from the AST node.
We now explicitly track when token collection must be performed due to
nomterminal parsing.