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.

Sign up for GitHub

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

Jump to bottom

parser: fix ICE when parsing token trees after an error #39674

Merged
merged 1 commit into from
Feb 10, 2017
Merged

parser: fix ICE when parsing token trees after an error #39674

merged 1 commit into from
Feb 10, 2017

Conversation

jseyfried
Copy link
Contributor

Fixes #39388, fixes #39616.
r? @nrc

@jseyfried jseyfried added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 9, 2017
@jseyfried
Copy link
Contributor Author

This PR is mostly moot after #39419 lands, but we don't want to backport that.

This was referenced Feb 9, 2017
Closed
Closed
@nrc
Copy link
Member

nrc commented Feb 9, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 9, 2017

📌 Commit 66bd8ee has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 10, 2017
@frewsxcv
Rollup merge of rust-lang#39674 - jseyfried:fix_token_tree_parsing_IC…
ed7f3c4 
…E, r=nrc

parser: fix ICE when parsing token trees after an error

Fixes rust-lang#39388, fixes rust-lang#39616.
r? @nrc
@frewsxcv frewsxcv mentioned this pull request Feb 10, 2017
Merged
bors added a commit that referenced this pull request Feb 10, 2017
@bors
Auto merge of #39712 - frewsxcv:rollup, r=frewsxcv
f805144 
Rollup of 6 pull requests

- Successful merges: #39587, #39674, #39693, #39700, #39705, #39707
- Failed merges:
@bors bors merged commit 66bd8ee into rust-lang:master Feb 10, 2017
@brson brson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 23, 2017
@brson
Copy link
Contributor

brson commented Feb 23, 2017

Accepted for beta. Picks cleanly. ICEs bad.

@brson brson mentioned this pull request Feb 23, 2017
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 23, 2017
bors added a commit that referenced this pull request Mar 2, 2017
@bors
Auto merge of #40046 - brson:beta-next, r=alexcrichton
ecbf0b5 
[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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Expected type panic in parsing array type Rustc (nightly) panic!s on macro definition
5 participants
@jseyfried @nrc @bors @brson @alexcrichton