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

Bounce out the layout refactor from beta #46925

Merged
merged 5 commits into from
Dec 22, 2017

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Dec 21, 2017

@eddyb's #45225 was supposed to get into get into 1.24, but due to an ordering mistake, it had snuck into 1.23.

That wide-effect translation-changing PR had poked LLVM's weak corners and caused many regressions (3 of them have fixes I include here, but also #46897, #46845, #46449, #46371). I don't think it is a good idea to land it in the beta (1.23) because there are bound to be some regressions we didn't patch.

Therefore, I am reverting it in time for stable, along with its related regression fixes.

r? @michaelwoerister (I think)

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

This reverts commit f50fd07, reversing
changes made to 5041b3b.
@arielb1 arielb1 changed the title Bounce out trans-related PRs from beta Bounce out the layout refactor from beta Dec 21, 2017
@arielb1
Copy link
Contributor Author

arielb1 commented Dec 21, 2017

I thought that @alexcrichton's PR #45905 conflicts with #45225, but it is not based on @eddyb's PR and landed in parallel with it, so it's probably a better idea to leave it in.

@eddyb
Copy link
Member

eddyb commented Dec 21, 2017

r=me

This should make sure that they stay fixed.
@arielb1
Copy link
Contributor Author

arielb1 commented Dec 21, 2017

This is a big beta change

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Dec 21, 2017

📌 Commit d6a5946 has been approved by arielb1

@bors
Copy link
Contributor

bors commented Dec 22, 2017

⌛ Testing commit d6a5946 with merge 4979bcc...

bors added a commit that referenced this pull request Dec 22, 2017
Bounce out the layout refactor from beta

@eddyb's #45225 was supposed to get into get into 1.24, but due to an ordering mistake, it had snuck into 1.23.

That wide-effect translation-changing PR had poked LLVM's weak corners and caused many regressions (3 of them have fixes I include here, but also #46897, #46845, #46449, #46371). I don't think it is a good idea to land it in the beta (1.23) because there are bound to be some regressions we didn't patch.

Therefore, I am reverting it in time for stable, along with its related regression fixes.

r? @michaelwoerister (I think)
@bors
Copy link
Contributor

bors commented Dec 22, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: arielb1
Pushing 4979bcc to beta...

@bors bors merged commit d6a5946 into rust-lang:beta Dec 22, 2017
@michaelwoerister
Copy link
Member

Thanks, folks!

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.

5 participants