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

[main] Cherry picks from 0.2 #4070

Merged
merged 10 commits into from
Nov 17, 2024
Merged

[main] Cherry picks from 0.2 #4070

merged 10 commits into from
Nov 17, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 17, 2024 •
edited
Loading

@tgross35
Explicitly set the edition to 2015
e2dd171 
This just suppresses a warning. Ideally this should go to 2021 but that
requires quite a bit of refactoring, so hold off until the rest of the
0.2 cleanup is complete.

(apply <rust-lang#4058> to `main`)
(cherry picked from commit 1e88f41)
@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 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

@tgross35 tgross35 force-pushed the main-cherry-picks branch 9 times, most recently from 284a5c4 to 3e30c8b Compare November 17, 2024 00:57
@tgross35 tgross35 force-pushed the main-cherry-picks branch 3 times, most recently from e65fce1 to a618690 Compare November 17, 2024 01:08
@tgross35 tgross35 force-pushed the main-cherry-picks branch 2 times, most recently from 9207098 to aea752a Compare November 17, 2024 01:16
@rustbot rustbot added the O-wasi label Nov 17, 2024
@tgross35 tgross35 force-pushed the main-cherry-picks branch 2 times, most recently from ea3b115 to 7dd0600 Compare November 17, 2024 01:20
tgross35 and others added 5 commits November 16, 2024 19:26
@tgross35
Require rust >= 1.25 and drop libc_align conditional
e703c85 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

(apply <rust-lang#4057> to `main`)
(cherry picked from commit b5b553d)

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
@joshtriplett @tgross35
Require rust >= 1.26 and drop libc_int128 conditional
a26e54b 
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
@joshtriplett @tgross35
Require rust >= 1.30 and drop libc_core_cvoid conditional
6d894f1 
Move the `c_void` re-export to the top-level `lib.rs`.

(apply <rust-lang#4060> to `main`)
(cherry picked from commit e221887)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
@joshtriplett @tgross35
Require rust >= 1.33 and drop libc_packedN conditional
5e23131 
[ resolve conflicts, update to latest - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 9dac79f)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
@joshtriplett @tgross35
Require rust >= 1.33 and drop libc_cfg_target_vendor conditional
c754031 
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 3d97cdf)

No changes in this cherry pick, `main` is already up to date.
@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

joshtriplett and others added 4 commits November 16, 2024 19:41
@joshtriplett @tgross35
Require rust >= 1.40 and drop libc_non_exhaustive conditional
4558339 
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit d00d1de)
@joshtriplett @tgross35
Remove array size hacks for Rust < 1.47
f4bbbc8 
Rust >= 1.47 supports traits for arrays of arbitrary size, so remove the
various hacks using nested arrays when the native platform definition
uses a single array.

(apply <rust-lang#4062> to `main`)
(cherry picked from commit 27ee6fe)
@tgross35
Fix a few other array size hacks
f41e395 
Sources:

* FreeBSD `__reserve_pad`: [1]
* NetBSD `accept_filter_arg`: https://man.netbsd.org/setsockopt.2

[1]: https://github.com/freebsd/freebsd-src/blob/4b4e88d9425b59a377a71ffeb553376b1c60a80e/sys/netinet/sctp_uio.h#L110-L146

(apply <rust-lang#4062> to `main`)
(cherry picked from commit d63be8b)
@tgross35
Drop the ptr_addr_of conditional
e855f2f 
This is possible since increasing the MSRV to 1.63

(apply <rust-lang#4065> to `main`)
(cherry picked from commit 85eac5f)
@tgross35 tgross35 added this pull request to the merge queue Nov 17, 2024
Merged via the queue into rust-lang:main with commit eccfe7a Nov 17, 2024
44 checks passed
This was referenced Nov 17, 2024
Closed
Draft
Merged
@tgross35 tgross35 deleted the main-cherry-picks branch November 17, 2024 07:43
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-dragonfly O-gnu O-illumos O-linux O-macos O-mips O-musl O-newlib O-riscv O-solarish O-sparc O-unix O-wasi O-windows 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 @JohnTitor @joshtriplett