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

Fix ICE on include!(line!()) (regression) #42006

Merged
merged 1 commit into from
May 19, 2017
Merged

Fix ICE on include!(line!()) (regression) #42006

merged 1 commit into from
May 19, 2017

Conversation

jseyfried
Copy link
Contributor

Fixes #41776.
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 May 15, 2017
@jseyfried jseyfried mentioned this pull request May 15, 2017
Closed
@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 15, 2017
@alexcrichton
Copy link
Member

ping @nrc, mind taking a look at this?

@nrc
Copy link
Member

nrc commented May 18, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented May 18, 2017

📌 Commit 4f2f270 has been approved by nrc

@nrc nrc added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 18, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 18, 2017
@Mark-Simulacrum
Rollup merge of rust-lang#42006 - jseyfried:fix_include_regression, r…
1dd787c 
…=nrc

Fix ICE on `include!(line!())` (regression)

Fixes rust-lang#41776.
r? @nrc
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 18, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 18, 2017
@frewsxcv
Rollup merge of rust-lang#42006 - jseyfried:fix_include_regression, r…
0b73653 
…=nrc

Fix ICE on `include!(line!())` (regression)

Fixes rust-lang#41776.
r? @nrc
@frewsxcv frewsxcv mentioned this pull request May 18, 2017
Closed
@bors
Copy link
Contributor

bors commented May 19, 2017

⌛ Testing commit 4f2f270 with merge 12cc13c...

@bors
Copy link
Contributor

bors commented May 19, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 19, 2017
@Mark-Simulacrum
Rollup merge of rust-lang#42006 - jseyfried:fix_include_regression, r…
8b93680 
…=nrc

Fix ICE on `include!(line!())` (regression)

Fixes rust-lang#41776.
r? @nrc
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 19, 2017
Merged
bors added a commit that referenced this pull request May 19, 2017
@bors
Auto merge of #42105 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
5dfcd85 
Rollup of 17 pull requests

- Successful merges: #41870, #41910, #41958, #41971, #42006, #42024, #42037, #42056, #42067, #42070, #42079, #42080, #42082, #42089, #42092, #42096, #42100
- Failed merges:
@bors bors merged commit 4f2f270 into rust-lang:master May 19, 2017
@brson brson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 23, 2017
@brson
Copy link
Contributor

brson commented May 23, 2017

Accepting for backport. Small fix.

@brson brson mentioned this pull request May 23, 2017
Merged
bors added a commit that referenced this pull request May 23, 2017
@bors
Auto merge of #42161 - brson:beta-next, r=alexcrichton
139d12f 
[beta] backports

- #42006
- #41904

Bumps the version so we get a new beta.

@sfackler libs backports here

@nikomatsakis there are several other nominated PRs that don't cherry-pick cleanly: https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-nominated+is%3Aclosed. Can you take a look or recruit someone else to?

r? @alexcrichton
@nikomatsakis nikomatsakis removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 25, 2017
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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
7 participants
@jseyfried @alexcrichton @nrc @bors @brson @nikomatsakis @carols10cents