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.24 and drop libc_const_size_of conditional #4056

Merged
merged 2 commits into from
Nov 16, 2024
Merged

[0.2] Require rust >= 1.24 and drop libc_const_size_of conditional #4056

merged 2 commits into from
Nov 16, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 16, 2024 •
edited
Loading

[ resolve conflicts - Trevor ]

Applied from #2845

@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-const-size branch from 268d719 to 9c29321 Compare November 16, 2024 10:06
@rustbot rustbot added the O-mips label Nov 16, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to invalid changes in the merge commit Nov 16, 2024
@tgross35 tgross35 force-pushed the remove-cfg-const-size branch from 9c29321 to 3be8fce Compare November 16, 2024 11:05
@tgross35 tgross35 enabled auto-merge November 16, 2024 11:05
@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 force-pushed the remove-cfg-const-size branch from 3be8fce to dc921f9 Compare November 16, 2024 11:43
@joshtriplett @tgross35
Require rust >= 1.24 and drop libc_const_size_of conditional
5a43dd2 
[ resolve conflicts and remove a couple newer `cfg`s - Trevor ]
@tgross35 tgross35 force-pushed the remove-cfg-const-size branch from dc921f9 to 5a43dd2 Compare November 16, 2024 11:44
@tgross35
Copy link
Contributor Author

This will include #4055 to save queuing one item.

@tgross35 tgross35 added this pull request to the merge queue Nov 16, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 93406f8 Nov 16, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-cfg-const-size 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-mips O-musl O-riscv 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.
5 participants
@tgross35 @rustbot @bors @JohnTitor @joshtriplett