[0.2] Backports #4468
Merged
[0.2] Backports #4468
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
run cargo clippy for all targets (backport <rust-lang#4411>) (cherry picked from commit bea4d1b)
(backport <rust-lang#4411>) (cherry picked from commit 5997a8b)
(backport <rust-lang#4411>) (cherry picked from commit e09683e)
(backport <rust-lang#4416>) (cherry picked from commit 444d9df)
run `cargo clippy --all-targets` on `libc-test/build.rs`, and fix all default issues. Notes: * `copy_dir_hotfix` had a `replace` parameter that was never used (backport <rust-lang#4412>) [ adjust section heading to avoid ### turning into comment - Trevor ] (cherry picked from commit 8b15e27)
rustbot
added
A-CI
|
(backport <rust-lang#4415>) [ drop changes around the FreeBSD version in build.rs since the logic isn't the same - Trevor ] (cherry picked from commit a283b9e)
(backport <rust-lang#4436>) (cherry picked from commit 0d7f0ce)
(backport <rust-lang#4448>) (cherry picked from commit 054c958)
(backport <rust-lang#4447>) (cherry picked from commit 118a904)
This will be chosen based on the RUST_LIBC_UNSTABLE_MUSL_V1_2_3 variable. Co-authored-by: Daniel Frampton <Daniel.Frampton@microsoft.com> (backport <rust-lang#4443>) (cherry picked from commit e7762a8)
This commit gates various workarounds of older musl versions behind the RUST_LIBC_UNSTABLE_MUSL_V1_2_3 variable. (backport <rust-lang#4443>) (cherry picked from commit 85a7c85)
This was accidentally set to 0 in upstream, but fixed in commit b8b729b. If running with prior versions without that commit, this commit effectively backports it. (backport <rust-lang#4443>) (cherry picked from commit 686aa7a)
This feature, controlled by the environment variable RUST_LIBC_UNSTABLE_MUSL_V1_2_3 will control whether breaking changes up to musl v1.2.3 will be reflected (backport <rust-lang#4443>) (cherry picked from commit 2a68f7f)
This ut_session has changed from long to int + padding in newer versions. This was already reflected on loongarch64 and ohos - this commit adds this change, and re-enables the test when musl_v1_2_3 is set. Co-authored-by: Ariadne Conill <ariadne@dereferenced.org> (backport <rust-lang#4443>) (cherry picked from commit 1038c7f)
This reflects the upstream commits, 5e0c9f2 and d4f2981, which reflect changes in linux 5.4 and 5.5 respectively As mentioned in the comments, this is possible now as the CI musl version has updated and the headers are newer. (backport <rust-lang#4443>) (cherry picked from commit fb4212a)
This reflects upstream commit 2507e7f. This should be safe to change as this has been marked deprecated to warn people it will change across OS versions since 0.2.64 (>5 years ago) (backport <rust-lang#4443>) (cherry picked from commit 5d24ad2)
This isn't strictly related to musl 1.2.3, however now presents a good time to change it, before the 1.0 release. (backport <rust-lang#4443>) (cherry picked from commit 3f81aad)
The architecture-specific definitions was removed in upstream commit 319b2d0, changing the type to the generic definition of int. (backport <rust-lang#4443>) (cherry picked from commit 3f91173)
This silences shellcheck warnings (backport <rust-lang#4443>) (cherry picked from commit 60f7b3d)
Disable warnings when crosslinking issues, since we do want contributors to do this. Cc: rust-lang/triagebot#1966 (backport <rust-lang#4444>) (cherry picked from commit 6a8609c)
(backport <rust-lang#4452>) (cherry picked from commit 6e7549d)
[ref](https://github.com/freebsd/freebsd-src/blob/d3f15bc2a51d1822795135d9ad4627dc1c7f2b18/sys/sys/socket.h#L175) and [ref](https://github.com/freebsd/freebsd-src/blob/d3f15bc2a51d1822795135d9ad4627dc1c7f2b18/sys/sys/socketvar.h#L76) (backport <rust-lang#4451>) (cherry picked from commit 47ac2e7)
(backport <rust-lang#4454>) (cherry picked from commit adcb2b8)
Currently only `src/` is checked. Add a run that covers everything else. This does mean files in `src/` get formatted twice, but `cargo fmt` doesn't support an `--exclude` option. (backport <rust-lang#4454>) (cherry picked from commit 1ca8b36)
There are no longer any shell files in `ctest/`, so this FIXME can be resolved. Also move this to the end so missing shellcheck doesn't exit before the sort checks. (backport <rust-lang#4454>) [ note - this backport doesn't do much since `ctest/` was never excluded, but it does keep file structure in sync - Trevor ] (cherry picked from commit 654bf4e)
(backport <rust-lang#4450>) (cherry picked from commit c192a5c)
(backport <rust-lang#4418>) (cherry picked from commit 49a6e23)
* Declare `arc4random` and `arc4random_buf` as extern "C" functions in the NuttX module * Enable access to system-provided random number generation for NuttX targets * Aligns NuttX FFI with other Unix platforms that expose these functions This change allows Rust code targeting NuttX to use `arc4random` and `arc4random_buf` for secure random number generation, improving compatibility and feature parity with other targets. (backport <rust-lang#4464>) (cherry picked from commit f8e4746)
(backport <rust-lang#4434>) (cherry picked from commit abd00f8)
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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:
libc-test/build.rs#4412issue-links.check-commits = false#4444cargo fmtis run on all files #4454