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

[beta] back out #42480 and its dependents #43952

Merged
merged 3 commits into from
Aug 19, 2017
Merged

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Aug 17, 2017

#42480 makes the ICE in #43132 worse, and the "safe" fix to that causes the #43787 exponential worst-case.

Let's back everything out for beta to avoid regressions, and get the permafix in nightly.

…ize-trait-selection, r=michaelwoerister"

This reverts commit b4502f7, reversing
changes made to 23ecebd.
…ors, r=nikomatsakis"

This reverts commit 9b85e1c, reversing
changes made to 13157c4.
@arielb1
Copy link
Contributor Author

arielb1 commented Aug 17, 2017

cc @nikomatsakis

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 17, 2017

📌 Commit 97e9c7e has been approved by nikomatsakis

@arielb1
Copy link
Contributor Author

arielb1 commented Aug 17, 2017

This appears to fix all relevant issues.

@kennytm
Copy link
Member

kennytm commented Aug 18, 2017

@nikomatsakis @arielb1 The Homu queue doesn't register the r+, and it says "Mergeable = no". This may need a git commit --amend to refresh bors's status.

@bors
Copy link
Contributor

bors commented Aug 19, 2017

⌛ Testing commit 97e9c7e with merge 74d6f394826f597da41e376cb7b7de37e3935175...

@bors
Copy link
Contributor

bors commented Aug 19, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Aug 19, 2017

@bors retry #43985

@bors
Copy link
Contributor

bors commented Aug 19, 2017

⌛ Testing commit 97e9c7e with merge b212a3f...

bors added a commit that referenced this pull request Aug 19, 2017
[beta] back out #42480 and its dependents

#42480 makes the ICE in #43132 worse, and the "safe" fix to that causes the #43787 exponential worst-case.

Let's back everything out for beta to avoid regressions, and get the permafix in nightly.
@bors
Copy link
Contributor

bors commented Aug 19, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing b212a3f to beta...

@bors bors merged commit 97e9c7e into rust-lang:beta Aug 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants