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

avoid ICE when region sneaks into impl trait #58649

Merged
merged 1 commit into from
Feb 25, 2019
Merged

avoid ICE when region sneaks into impl trait #58649

merged 1 commit into from
Feb 25, 2019

Conversation

pnkfelix
Copy link
Member

@pnkfelix pnkfelix commented Feb 22, 2019 •
edited
Loading

Addresses non-NLL instances of #57464

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2019
@pnkfelix pnkfelix changed the title avoid ice when region sneaks into impl trait avoid ICE when region sneaks into impl trait Feb 22, 2019
@Centril
Copy link
Contributor

Centril commented Feb 22, 2019

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned varkor Feb 22, 2019
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit 8a0a0dad79d460e4b5656777c782f172ce517ea0 has been approved by nikomatsakis

@bors bors 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 Feb 22, 2019
@Centril
Copy link
Contributor

Centril commented Feb 22, 2019

Possible backport candidate, @bors p=10

@oli-obk oli-obk added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Feb 22, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Feb 22, 2019

beta nominating and auto-accepting as per the discussion in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/.2358649.20backport.3F/near/159168423 (in short: going from bug! to delay_span_bug has zero risks)

@Centril Centril mentioned this pull request Feb 22, 2019
Closed
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 22, 2019
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 22, 2019
@Mark-Simulacrum
Copy link
Member

We ended up backing the test out of the beta rollup (it failed).

@pnkfelix
Copy link
Member Author

@bors r-

It won’t land because the test added here will break under compare-mode=nll. (Or at least that’s my best guess as to what has gone on with this PR and the beta backport)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 22, 2019
bors added a commit that referenced this pull request Feb 23, 2019
@bors
Auto merge of #58656 - Mark-Simulacrum:beta-rollups, r=pietroalbini
bb2d0ea 
Beta rollups

 - #58649
 - #58592
 - #58574
 - #58227
 - #58056
 - #57859
 - #57710

A few of these are via #58641.

r? @pietroalbini
@pnkfelix pnkfelix force-pushed the issue-57464-avoid-ice-when-region-sneaks-into-impl-trait branch from 8a0a0da to 4f89846 Compare February 25, 2019 12:14
@pnkfelix
Copy link
Member Author

I removed the test (which causes compare-mode=nll to break).

I'm going to r+ the partial fix mostly to bring master in parity with beta.

I'm leaving #57464 open because I want to figure out the more general fix before closing it.

@pnkfelix
Copy link
Member Author

@bors r+ 4f89846

@pnkfelix
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Feb 25, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Feb 25, 2019

📌 Commit 4f89846 has been approved by pnkfelix

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 25, 2019
@bors
Copy link
Contributor

bors commented Feb 25, 2019

⌛ Testing commit 4f89846 with merge b57fe74...

bors added a commit that referenced this pull request Feb 25, 2019
@bors
Auto merge of #58649 - pnkfelix:issue-57464-avoid-ice-when-region-sne…
b57fe74 
…aks-into-impl-trait, r=pnkfelix

avoid ICE when region sneaks into impl trait

Addresses non-NLL instances of #57464
@bors
Copy link
Contributor

bors commented Feb 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pnkfelix
Pushing b57fe74 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2019
@bors
Copy link
Contributor

bors commented Feb 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pnkfelix
Pushing b57fe74 to master...

@bors bors merged commit 4f89846 into rust-lang:master Feb 25, 2019
@pnkfelix pnkfelix mentioned this pull request Feb 26, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@pnkfelix @rust-highfive @Centril @nikomatsakis @bors @oli-obk @Mark-Simulacrum @pietroalbini @varkor