[0.2] Backports #4142
Merged
[0.2] Backports #4142
Conversation
This file contains 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
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use |
tgross35
force-pushed
the
backport-delicata-squash
branch
2 times, most recently
from
00fc492 to
fd8bf07
Compare
Update the musl headers in CI to use alpine-linux instead of sabotage-linux. Alpine also uses musl but follows the linux stable releases, providing more up-to-date headers. Signed-off-by: Pedro Tammela <pctammela@gmail.com> (backport <rust-lang#3921>) (cherry picked from commit acc75e7) Signed-off-by: Trevor Gross <tmgross@umich.edu>
Now that we have Linux 6.6 we can clean up some of the test exceptions. Not all of them can be removed, so the comments are updated if needed. Signed-off-by: Pedro Tammela <pctammela@gmail.com> (backport <rust-lang#3921>) (cherry picked from commit 55f9451) Signed-off-by: Trevor Gross <tmgross@umich.edu>
(backport <rust-lang#4128>) (cherry picked from commit 38318cd)
(backport <rust-lang#4046>) (cherry picked from commit d691ee7)
Add `group_imports` and `import_granularity` to our rustfmt config. These values are the same as in rust-lang/rust. (backport <rust-lang#4136>) (cherry picked from commit 0456dcb)
`libc-0.2` version of 236e069 from [1] (not a direct cherry pick). [1]: rust-lang#4136
The statx system call and corresponding constants are defined by the Linux kernel and don't depend on the libc or architecture. The only difference is whether a libc exports the statx syscall wrapper or not. We can thus unify the statx definitions for all Linux "like" platforms: GNU (glibc), Android (bionic), and (in a later commit) musl. Plain u64 (or uint64_t in C) can't be used for the statx fields because bionic defines them as __u64, and provides incompatible definitions of uint64_t and __u64. (backport <rust-lang#3978>) (cherry picked from commit e46bbe4)
This API appears to not be available in more recent MacOS SDKs, and there aren't any functions that use it. Since this hasn't yet made it into a release, remove it. Link: rust-lang#4022 (backport <rust-lang#4137>) (cherry picked from commit e87acba)
This moves similar types together (e.g. statfs and statfs64) so removing them is cleaner. Co-authored-by: Andy Caldwell <andycaldwell@microsoft.com> (backport <rust-lang#3261>) (cherry picked from commit 6c0952e)
Musl provides a single definition for `siginfo_t` [1] with the order of `si_code` and `si_errno` controlled by `__SI_SWAP_ERRNO_CODE`. This is only set on mips (both 32- and 64-bit). [1]: https://github.com/kraj/musl/blob/ffb23aef7b5339b8c3234f4c6a93c488dc873919/include/signal.h#L99-L147 [ extracted from "Remove all redundant definitions in musl backend", add context to the commit message - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit e1ff5d6)
`statvfs` already exists in `musl/mod.rs`. Use that were possible and move a common version of `statvfs64` there. [ reduce this patch to only cover statvfs*, leaving statfs as a separate change - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit adcc84d)
Only mips uses a special statfs(64) [ squash "Use `#[cfg]` blocks to special-case statfs on mips", change this patch to only cover statfs and statfs64, include part of "Remove new redundant definitions" - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit fb7785a)
These types are redundant as they are exported from higher-level modules. [ move some non-statfs fixups here from other commits in the series, add context to the commmit message - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit b196045)
[ squash "Re-add explicit padding in 32-bit statvfs", reword commit summary - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit d210d71)
These are redundant as they are exported from higher-level modules. [ extract this commit to only cover glibc - Trevor ] (backport <rust-lang#3261>) (cherry picked from commit ca7eedd)
tgross35
force-pushed
the
backport-delicata-squash
branch
from
fd8bf07 to
2018bca
Compare
|
Note to self, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
ptp_clock_caps#4128if_family_id#4137siginfo_t,statvfsandstatfsinmusltargets #3261