Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_token_tree_parsing_ICE
Feb 10, 2017
Merged

parser: fix ICE when parsing token trees after an error#39674
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_token_tree_parsing_ICE

Conversation

@jseyfried

Copy link
Copy Markdown
Contributor

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

@jseyfriedjseyfried 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
Copy Markdown
ContributorAuthor

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

@nrc

nrc commented Feb 9, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Feb 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 66bd8ee has been approved by nrc

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
Fixesrust-lang#39388, fixesrust-lang#39616.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Feb 10, 2017
bors added a commit that referenced this pull request Feb 10, 2017
Rollup of 6 pull requests
- Successful merges: #39587, #39674, #39693, #39700, #39705, #39707
- Failed merges:
@bors
bors merged commit 66bd8ee into rust-lang:masterFeb 10, 2017
@brsonbrson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 23, 2017
@brson

Copy link
Copy Markdown
Contributor

Accepted for beta. Picks cleanly. ICEs bad.

@brsonbrson mentioned this pull request Feb 23, 2017
@alexcrichtonalexcrichton 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
[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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

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