[0.2] Backports #4812
Merged
[0.2] Backports #4812
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-CI
(backport <rust-lang#4776>) (cherry picked from commit 1b84fd8) [ `cargo update` run after the cherry pick - Trevor ]
Default jobs to ubuntu-24.04 but allow for overrides, and decide whether or not to run in Docker based on the target OS being Linux (rather than needing to specify). (backport <rust-lang#4776>) (cherry picked from commit c239dce)
(backport <rust-lang#4776>) (cherry picked from commit 49c300a)
aarch64-windows and aarch64-linux are now both tier 1, so promote them in CI. (backport <rust-lang#4776>) (cherry picked from commit 3655bfd)
There isn't really any reason to use both `include` and the default matrix with `target` separately. This requires adding an artifact tag to the musl jobs. Additionally, flatten some bulky env options and prepare the Tier 2 VM targets to have more operating systems. (backport <rust-lang#4776>) (cherry picked from commit 8b300eb)
We have gained quite a few tier 2 jobs. Increase max-parallel so they don't take quite as long. (backport <rust-lang#4776>) (cherry picked from commit e3cbac6)
Occasionally we need to define structs that keep the expected set of traits but aren't crate-public. Add support to the macros to do this. (backport <rust-lang#4783>) (cherry picked from commit cdcc466)
This was being set as part of CI but not forwarded to the jobs. Start passing it now. (backport <rust-lang#4775>) (cherry picked from commit ab130bf)
It appeared that tests with the constants here were passing in CI with new versions of musl before, but that was only because the correct config wasn't being set. Go back to our original configuration (with some cleanup) to resolve this. Fixes: dd44cb6 ("test: linux: Unskip types and constants that are now available") (backport <rust-lang#4775>) (cherry picked from commit 075c118)
(backport <rust-lang#4784>) (cherry picked from commit 7b9f8fd)
tgross35
force-pushed
the
backport-anasazi
branch
from
152d7ca to
4c464c9
Compare
Collaborator
|
This PR was rebased onto a different libc-0.2 commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Collaborator
|
Since glibc supports both 32- and 64-bit time_t and off_t without different setup (just a header define in libc-test), these don't have any need to be standalone jobs. Switch glibc config variants to be checked as part of `run.sh`, which means we are now covering all 32-bit platforms by default. (backport <rust-lang#4785>) (cherry picked from commit cbf2b8a)
Commonize to always build 1.2.5 for tests that require a newer musl, rather than either 1.2.3 or 1.2.5 based on the version. (backport <rust-lang#4788>) (cherry picked from commit 03e32e8)
(backport <rust-lang#4790>) (cherry picked from commit 095aae8)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> (backport <rust-lang#4791>) (cherry picked from commit bf2bd19)
We can't yet use the standard library's macro since it isn't in our MSRV, but there are a couple of applicatons for having `offset_of` available. Add a polyfill for now. (backport <rust-lang#4792>) (cherry picked from commit 1808393)
Split all dependencies to new lines and sort them, and use consistent indentation across all files. (backport <rust-lang#4795>) (cherry picked from commit 2e208d0)
`linux-headers-generic` isn't needed, sparc no longer needs the dependencies to prepare for using qemu-system, and g++ isn't needed for platforms that have a C-only libc. (backport <rust-lang#4795>) (cherry picked from commit 584c1d3)
Co-authored-by: Immad Mir <[email protected]> (backport <rust-lang#4781>) (cherry picked from commit 2bee2f3)
Link: rust-lang#4781 (comment) (backport <rust-lang#4781>) (cherry picked from commit 5a1ced6)
(backport <rust-lang#4774>) (cherry picked from commit 91fc98c)
Create a module for common Posix-specified definitions in `unistd.h`,
which are then reexported by relevant targets. Populate this with the
`STD{IN,OUT,ERR}_FILENO` constants to start, which have posix-specified
values.
Link: https://pubs.opengroup.org/onlinepubs/007904975/basedefs/unistd.h.html
(backport <rust-lang#4774>)
(cherry picked from commit 9cf1a1c)
Establish the basic source reorganization for glibc, and seed it with a `net/route.h` definition. Glibc has the same headers in various locations, then copies or (I believe) combines them in the install location based on the target platform. To mirror this, our source primarily mirrors the glibc source tree, then reexports things in `src/new/glibc.rs` in the same way that glibc does when it creates an install. (backport <rust-lang#4540>) (cherry picked from commit 0399c4e)
This hits an error about a duplicate fma symbol while building std. (backport <rust-lang#4540>) (cherry picked from commit 5a9e1db)
(backport <rust-lang#4804>) (cherry picked from commit 4bc2673)
The musl module is enabled on ohos, so these are duplicates. (backport <rust-lang#4804>) (cherry picked from commit b30e714)
Move `struct msghdr`, `struct cmsghdr`, `sendmmsg`, and `recvmmsg` over at this time, as well as two `SOCK_*` constants that were in the musl module. Link: https://github.com/kraj/musl/blob/9f204467e88c75e36105d1359951c5857c20fe0b/include/sys/socket.h (backport <rust-lang#4539>) (cherry picked from commit 564e0ef)
1.63 doesn't support deriving `PartialEq` on non-`Copy` packed structs and will error out here because it doesn't realize `Copy` is added later. Swapping the order of the derives resolves this issue and enables us to derive `extra_traits` even on packed structs. (backport <rust-lang#4807>) (cherry picked from commit 79d1bdb)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport the following:
CopyandPartialEq, Hashderives for packed struct support #4807offset_ofmacro #4792musl_v1_2_3#4784s!ands_no_extra_traits!to take private items #4783verify-buildto a python script #4778