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.

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

avoid ICE when region sneaks into impl trait #58649

Merged
merged 1 commit into from Feb 25, 2019

Conversation

Projects
None yet
9 participants
@pnkfelix
Copy link
Member

pnkfelix commented Feb 22, 2019

Addresses non-NLL instances of #57464

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

rust-highfive commented Feb 22, 2019

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@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

This comment has been minimized.

Copy link
Contributor

Centril commented Feb 22, 2019

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

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

nikomatsakis commented Feb 22, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit 8a0a0da has been approved by nikomatsakis

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Feb 22, 2019

Possible backport candidate, @bors p=10

@oli-obk

This comment has been minimized.

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)

@Mark-Simulacrum Mark-Simulacrum referenced this pull request Feb 22, 2019

Merged

Beta rollups #58656

bors added a commit that referenced this pull request Feb 22, 2019

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Feb 22, 2019

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

@pnkfelix

This comment has been minimized.

Copy link
Member Author

pnkfelix commented Feb 22, 2019

@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 added a commit that referenced this pull request Feb 23, 2019

@pnkfelix pnkfelix force-pushed the pnkfelix:issue-57464-avoid-ice-when-region-sneaks-into-impl-trait branch from 8a0a0da to 4f89846 Feb 25, 2019

@pnkfelix

This comment has been minimized.

Copy link
Member Author

pnkfelix commented Feb 25, 2019

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

This comment has been minimized.

Copy link
Member Author

pnkfelix commented Feb 25, 2019

@pnkfelix

This comment has been minimized.

Copy link
Member Author

pnkfelix commented Feb 25, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 25, 2019

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

  • There's another pull request that is currently being tested, blocking this pull request: #58728
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 25, 2019

📌 Commit 4f89846 has been approved by pnkfelix

@bors

This comment has been minimized.

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

Auto merge of #58649 - pnkfelix:issue-57464-avoid-ice-when-region-sne…
…aks-into-impl-trait, r=pnkfelix

avoid ICE when region sneaks into impl trait

Addresses non-NLL instances of #57464
@bors

This comment has been minimized.

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 label Feb 25, 2019

@bors

This comment has been minimized.

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

1 check passed

homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.