Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

macros: fix ICE on some nested macro definitions #40813

Merged
merged 1 commit into from
Mar 29, 2017
Merged

macros: fix ICE on some nested macro definitions #40813

merged 1 commit into from
Mar 29, 2017

Conversation

jseyfried
Copy link
Contributor

Fixes #40770.
r? @nrc

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

@nrc nrc left a comment

Choose a reason for hiding this comment

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

@bors: r+

@nrc
Copy link
Member

nrc commented Mar 27, 2017

@bors: r+

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

@bors
Copy link
Contributor

bors commented Mar 27, 2017

📌 Commit 29a052d has been approved by nrc

@bors
Copy link
Contributor

bors commented Mar 27, 2017

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

@bors
Copy link
Contributor

bors commented Mar 27, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

@alexcrichton alexcrichton 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 of rust-lang#40813 - jseyfried:fix_expansion_regression,…
1fe2dfc 
… r=nrc

macros: fix ICE on some nested macro definitions

Fixes rust-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:master Mar 29, 2017
@iliekturtles iliekturtles mentioned this pull request Mar 31, 2017
Closed
@jseyfried jseyfried deleted the fix_expansion_regression branch March 31, 2017 21:37
@bluss bluss mentioned this pull request Apr 3, 2017
Merged
@nikomatsakis
Copy link
Contributor

Accepting for beta. Small patch, regression.

cc @rust-lang/compiler

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 4, 2017
@alexcrichton alexcrichton mentioned this pull request Apr 4, 2017
Merged
@alexcrichton alexcrichton 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.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@nrc nrc nrc approved these changes

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.
5 participants
@jseyfried @nrc @bors @alexcrichton @nikomatsakis