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

don't double-apply variant padding to const enums #38023

Merged
merged 1 commit into from
Nov 27, 2016
Merged

don't double-apply variant padding to const enums #38023

merged 1 commit into from
Nov 27, 2016

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Nov 27, 2016 •
edited
Loading

build_const_struct already returns the struct with padding - don't double-apply it in the General case.

This should hopefully be the last time we have this sort of bug.

Fixes #38002.

Beta-nominating because regression.

r? @eddyb

@arielb1 arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 27, 2016
@eddyb
Copy link
Member

eddyb commented Nov 27, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Nov 27, 2016

📌 Commit fcebf3b has been approved by eddyb

@bors
Copy link
Contributor

bors commented Nov 27, 2016

⌛ Testing commit fcebf3b with merge f3930aa...

bors added a commit that referenced this pull request Nov 27, 2016
@bors
Auto merge of #38023 - arielb1:constant-evil-x2, r=eddyb
f3930aa 
don't double-apply variant padding to const enums

`build_const_struct` already returns the struct with padding - don't double-apply it in the `General` case.

This should hopefully be the last time we have this sort of bug.

Fixes #38002.

Beta-nominating because regression.

r? @eddyb
@bors
Copy link
Contributor

bors commented Nov 27, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing f3930aa to master...

@bors bors merged commit fcebf3b into rust-lang:master Nov 27, 2016
@brson brson added I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 10, 2016
@brson
Copy link
Contributor

brson commented Dec 10, 2016

Please review for backport.

@eddyb
Copy link
Member

eddyb commented Dec 10, 2016

@rust-lang/compiler This is a small regression fix. Any objections to backporting?

@brson
Copy link
Contributor

brson commented Dec 14, 2016

It applies cleanly so I'm porting.

@brson brson added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed I-nominated labels Dec 14, 2016
@brson brson mentioned this pull request Dec 15, 2016
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
beta-accepted Accepted 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@arielb1 @eddyb @bors @brson @alexcrichton