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

Implement RFC 1506 "Clarify the relationships between various kinds of structs and variants" #35138

Merged
merged 2 commits into from
Aug 13, 2016
Merged

Implement RFC 1506 "Clarify the relationships between various kinds of structs and variants" #35138

merged 2 commits into from
Aug 13, 2016

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Jul 31, 2016 •
edited
Loading

cc #35626

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@petrochenkov petrochenkov mentioned this pull request Jul 31, 2016
Merged
@bors
Copy link
Contributor

bors commented Aug 4, 2016

☔ The latest upstream changes (presumably #35015) made this pull request unmergeable. Please resolve the merge conflicts.

@petrochenkov
Copy link
Contributor Author

Rebased, tracking issue number added.
r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned pnkfelix Aug 12, 2016
@eddyb
Copy link
Member

eddyb commented Aug 12, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Aug 12, 2016

📌 Commit f662478 has been approved by eddyb

@bors
Copy link
Contributor

bors commented Aug 13, 2016

⌛ Testing commit f662478 with merge d3c3de8...

bors added a commit that referenced this pull request Aug 13, 2016
@bors
Auto merge of #35138 - petrochenkov:clarify, r=eddyb
d3c3de8 
Implement RFC 1506 "Clarify the relationships between various kinds of structs and variants"

cc #35626
@bors
Copy link
Contributor

bors commented Aug 13, 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-no-mir, 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-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing d3c3de8 to master...

@bors bors merged commit f662478 into rust-lang:master Aug 13, 2016
This was referenced Aug 13, 2016
Merged
Merged
@petrochenkov petrochenkov mentioned this pull request Aug 16, 2016
Merged
jseyfried added a commit to jseyfried/rust that referenced this pull request Aug 28, 2016
@jseyfried
Rollup merge of rust-lang#35728 - petrochenkov:empderive, r=manishearth
413ecde 
Fix #[derive] for empty tuple structs/variants

This was missing from rust-lang#35138
@petrochenkov petrochenkov deleted the clarify branch September 21, 2016 20:01
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@petrochenkov @rust-highfive @bors @eddyb @pnkfelix