Skip to content

macros: fix ICE on some nested macro definitions - #40813

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_expansion_regression
Mar 29, 2017
Merged

macros: fix ICE on some nested macro definitions#40813
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_expansion_regression

Conversation

@jseyfried

@jseyfriedjseyfried commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

Fixes#40770.
r? @nrc

@jseyfriedjseyfried mentioned this pull request Mar 25, 2017
Closed
@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 Mar 25, 2017
@jseyfriedjseyfried changed the title macros: fix ICE on certain nested macrosmacros: fix ICE on some nested macro definitionsMar 25, 2017
nrc
nrc approved these changes Mar 27, 2017
View reviewed changes

@nrcnrc left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors: r+

@nrc

nrc commented Mar 27, 2017

Copy link
Copy Markdown
Member

@bors: r+

(it looks like bors doesn't see comments in reviews?)

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 29a052d has been approved by nrc

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 29a052d with merge 43a0087...

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented Mar 27, 2017

Copy link
Copy Markdown
Member

@bors: retry

@alexcrichtonalexcrichton mentioned this pull request Mar 27, 2017
Merged
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 27, 2017
@alexcrichton
Rollup merge ofrust-lang#40813- jseyfried:fix_expansion_regression,…
1fe2dfc
… r=nrc
macros: fix ICE on some nested macro definitions
Fixesrust-lang#40770.
r? @nrc
bors added a commit that referenced this pull request Mar 27, 2017
@bors
Auto merge of#40867- alexcrichton:rollup, r=alexcrichton
32a2d73
Rollup of 19 pull requests
- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
bors added a commit that referenced this pull request Mar 28, 2017
@bors
Auto merge of#40867- alexcrichton:rollup, r=alexcrichton
07a3429
Rollup of 19 pull requests
- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
@bors
bors merged commit 29a052d into rust-lang:masterMar 29, 2017
@iliekturtlesiliekturtles mentioned this pull request Mar 31, 2017
Closed
@jseyfried
jseyfried deleted the fix_expansion_regression branch March 31, 2017 21:37
@blussbluss mentioned this pull request Apr 3, 2017
Merged
@nikomatsakis

nikomatsakis commented Apr 4, 2017

Copy link
Copy Markdown
Contributor

Accepting for beta. Small patch, regression.

cc @rust-lang/compiler

@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 4, 2017
@alexcrichtonalexcrichton mentioned this pull request Apr 4, 2017
Merged
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2017
bors added a commit that referenced this pull request Apr 5, 2017
@bors
Auto merge of#41071- alexcrichton:beta-next, r=alexcrichton
ca3d118
[beta] Backport accepted nominations
This is a backport of
* #40813
* #40849
This also includes #41069
Finally, this includes a bump to beta .3.
This is all current nominations except #40863, which is not passing tests yet.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@nrcnrcnrc approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jseyfried@nrc@bors@alexcrichton@nikomatsakis