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

[0.2] Require rust >= 1.19 and drop libc_union conditional #4055

Merged
1 commit merged into from
Nov 16, 2024
Merged

[0.2] Require rust >= 1.19 and drop libc_union conditional #4055

1 commit merged into from
Nov 16, 2024

Conversation

tgross35
Copy link
Contributor

Mostly taken from #2845, I just updated to remove all new libc_union uses.

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

@tgross35 tgross35 force-pushed the remove-cfg-union branch 5 times, most recently from 6539493 to d033ace Compare November 16, 2024 09:52
@tgross35 tgross35 changed the title Require rust >= 1.19 and drop libc_union conditional [0.2] Require rust >= 1.19 and drop libc_union conditional Nov 16, 2024
@tgross35 tgross35 enabled auto-merge November 16, 2024 10:03
@tgross35 tgross35 disabled auto-merge November 16, 2024 10:09
@tgross35 tgross35 added this pull request to the merge queue Nov 16, 2024
@tgross35 tgross35 removed this pull request from the merge queue due to a manual request Nov 16, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 16, 2024
@tgross35 tgross35 removed this pull request from the merge queue due to a manual request Nov 16, 2024
@tgross35 tgross35 enabled auto-merge November 16, 2024 11:04
@bors
Copy link
Contributor

bors commented Nov 16, 2024

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

@tgross35 @joshtriplett
Require rust >= 1.19 and drop libc_union conditional
b9e4d80 
This is mostly taken from Josh's work at
<rust-lang#2845>. I just updated to remove
all new uses of `libc_union` introduced since then.

Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@tgross35 tgross35 disabled auto-merge November 16, 2024 11:44
@tgross35 tgross35 mentioned this pull request Nov 16, 2024
Merged
@github-merge-queue github-merge-queue bot closed this pull request by merging all changes into rust-lang:libc-0.2 in 93406f8 Nov 16, 2024
@tgross35 tgross35 deleted the remove-cfg-union branch November 16, 2024 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@JohnTitor JohnTitor

Labels
O-android O-arm O-gnu O-linux O-macos O-musl O-solarish O-unix O-x86 S-waiting-on-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tgross35 @rustbot @bors @JohnTitor