rustc: Don't use DelimToken::None if possible#44745
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 23, 2017
Merged
Conversation
This commit fixes a regression from rust-lang#44601 where lowering attribute to HIR now involves expanding interpolated tokens to their actual tokens. In that commit all interpolated tokens were surrounded with a `DelimToken::None` group of tokens, but this ended up causing regressions like rust-lang#44730 where the various attribute parsers in `syntax/attr.rs` weren't ready to cope with `DelimToken::None`. Instead of fixing the parser in `attr.rs` this commit instead opts to just avoid the `DelimToken::None` in the first place, ensuring that the token stream should look the same as it did before where possible. Closes rust-lang#44730
Contributor
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
alexcrichton
added
the
S-waiting-on-review
Contributor
|
@bors r+ rollup |
Collaborator
|
📌 Commit 5053442 has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Sep 23, 2017
rustc: Don't use DelimToken::None if possible This commit fixes a regression from rust-lang#44601 where lowering attribute to HIR now involves expanding interpolated tokens to their actual tokens. In that commit all interpolated tokens were surrounded with a `DelimToken::None` group of tokens, but this ended up causing regressions like rust-lang#44730 where the various attribute parsers in `syntax/attr.rs` weren't ready to cope with `DelimToken::None`. Instead of fixing the parser in `attr.rs` this commit instead opts to just avoid the `DelimToken::None` in the first place, ensuring that the token stream should look the same as it did before where possible. Closes rust-lang#44730
bors
added a commit
that referenced
this pull request
Sep 23, 2017
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
5 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.
This commit fixes a regression from #44601 where lowering attribute to HIR now
involves expanding interpolated tokens to their actual tokens. In that commit
all interpolated tokens were surrounded with a
DelimToken::Nonegroup oftokens, but this ended up causing regressions like #44730 where the various
attribute parsers in
syntax/attr.rsweren't ready to cope withDelimToken::None. Instead of fixing the parser inattr.rsthis commitinstead opts to just avoid the
DelimToken::Nonein the first place, ensuringthat the token stream should look the same as it did before where possible.
Closes #44730