parser: fix ICE when parsing token trees after an error#39674
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 10, 2017
Merged
parser: fix ICE when parsing token trees after an error#39674bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
jseyfried
added
beta-nominated
Contributor
Author
|
This PR is mostly moot after #39419 lands, but we don't want to backport that. |
This was referenced Feb 9, 2017
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 66bd8ee has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Feb 10, 2017
…E, r=nrc parser: fix ICE when parsing token trees after an error Fixes rust-lang#39388, fixes rust-lang#39616. r? @nrc
brson
added
the
beta-accepted
Contributor
|
Accepted for beta. Picks cleanly. ICEs bad. |
Merged
alexcrichton
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Mar 2, 2017
[beta] next - #39913 - #39730 - #39674 - #39602 - #39586 - #39471 - #39980 - #40020 - #40135 @nikomatsakis [this commit](3787d33) did not pick cleanly. You might peek at it. I took the liberty of accepting all the nominations myself, but the [packed struct alignment](#39586) PR is quite large. It did pick fine though and there's a comment there suggesting it works on beta cc @rust-lang/compiler. cc @alexcrichton
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.
Fixes #39388, fixes #39616.
r? @nrc