[stable 1.96 backport] Backport portable-atomics to 1.96 branch#17134
Merged
ehuss merged 6 commits intoJun 24, 2026
Conversation
`std::sync::atomic::{AtomicU64, AtomicI64}`
are not available on some tier 2 32-bit platforms.
Replace them with `portable_atomic`,
which is already a transitive dependency via `gix` and `jiff`
See
* https://triage.rust-lang.org/gha-logs/rust-lang/rust/71938527712
* rust-lang/rust#155470 (comment)
This is a partial revert of 1d35833 We also downgrade to `Ordering::Relaxed` since `ignore::WalkParallel` joins threads (while it is implementation details, it should otherwise a bug to whatever used its result after)
`tracing-chrome@0.7.2` switched to `AtomicUsize` so the cfg gate was unnecessary. hence enabling our internal profiling support on all platforms. See <https://diff.rs/tracing-chrome/0.7.1/0.7.2/src%2Flib.rs>
We added this configuration but forgot to enabled it in lints See rust-lang#12988
rustbot
added
A-cli
Collaborator
|
r? @epage rustbot has assigned @epage. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Collaborator
|
ehuss
approved these changes
Jun 24, 2026
Member
Author
|
I pushed a bump of the cargo-util version, happy to drop that if we want to override the merge instead. |
Mark-Simulacrum
force-pushed
the
stable-portable-atomic
branch
from
c6bf6ea to
8e511d7
Compare
Contributor
|
That's good, I was just looking at that. |
rustbot
removed
the
S-waiting-on-review
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
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.
This backports #16906 (all commits) to the 1.96 branch, which is needed for compilation to certain tier 2 platforms; see failure here: rust-lang/rust#158331 (comment)