fix: use `portable-atomic` for 64-bit atomics by weihanglo · Pull Request #16906 · rust-lang/cargo

weihanglo · 2026-04-18T14:29:03Z

What does this PR try to resolve?

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

This also removes some other unnecessary AtomicU64 gates in

cargo-util
tracing-chrome

How to test and review this PR?

`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)

We added this configuration but forgot to enabled it in lints See rust-lang#12988

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>

rustbot · 2026-04-18T14:29:08Z

r? @epage

rustbot has assigned @epage.
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

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: @ehuss, @epage, @weihanglo
@ehuss, @epage, @weihanglo expanded to ehuss, epage, weihanglo
Random selection from ehuss, epage

weihanglo · 2026-04-18T15:02:15Z

https://github.com/rust-lang/cargo/actions/runs/24606774042/job/71954228414#step:15:879

---- util::local_poll_adapter::tests::deferred_success stdout ----

thread 'util::local_poll_adapter::tests::deferred_success' (9628) panicked at src/cargo/util/local_poll_adapter.rs:177:9:
assertion `left == right` failed
  left: Ready(Ok(50))
 right: Pending

Rerunning

Update cargo submodule 28 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..7ecf0285ebb408d596e4a8ac76a0980d8edb7005 2026-04-09 13:10:20 +0000 to 2026-04-18 15:34:11 +0000 - fix: use `portable-atomic` for 64-bit atomics (rust-lang/cargo#16906) - fix: rename incorrectly documented target-spec-json to json-target-sp… (rust-lang/cargo#16905) - Add global HTTP timeout tracking to http_async (rust-lang/cargo#16903) - feat(config): Stabilize `resolver.lockfile-path` config (rust-lang/cargo#16694) - chore(deps): update msrv (1 version) to v1.95 (rust-lang/cargo#16897) - fix: rebuild rustdoc json for different versions of a same crate (rust-lang/cargo#16773) - Add effective_url to http_async (rust-lang/cargo#16899) - Make crate downloads process as a queue rather than a stack (rust-lang/cargo#16898) - fix: sparse registry fetch progress reporting (rust-lang/cargo#16900) - chore: bump to 0.98.0; update changelog (rust-lang/cargo#16892) - docs(semver-check): update diagnostics to Rust 1.95 (rust-lang/cargo#16895) - docs(ref): Better highlight 'package --list' for include/exclude (rust-lang/cargo#16891) - docs: `include` doesnt apply gitignore from repo (rust-lang/cargo#16890) - fix: Update `bash` and `zsh` Autocompletion Documents to add `-m` (rust-lang/cargo#16888) - Add `-m` shorthand for `--manifest-path` (rust-lang/cargo#16858) - Fix a typo (rust-lang/cargo#16885) - Always take a shared lock on `.cargo-lock` (rust-lang/cargo#16886) - fix(toml): Teach users how to pin edition (rust-lang/cargo#16851) - fix: Prefer defined lint levels over default (rust-lang/cargo#16879) - chore(deps): bump rand from 0.10.0 to 0.10.1 (rust-lang/cargo#16883) - fix(lints): Ignore unused_crate_dependencies status (rust-lang/cargo#16877) - Copy cargo clean target-dir validation tests to clean_new_layout.rs (rust-lang/cargo#16878) - cargo clean: Add target directory validation (rust-lang/cargo#16712) - Docs: "api" in the configuration should not include a trailing slash (rust-lang/cargo#16869) - fix(core): use `closest_msg` to suggest similar member name for mistyped `-p` (rust-lang/cargo#16844) - chore(ci): Pin GitHub Actions to commit SHAs (rust-lang/cargo#16868) - chore(ci): Update `actions/checkout` from v5 to v6 (rust-lang/cargo#16867) - Add test for cargo install with github fastpath (rust-lang/cargo#16866)

arlosi · 2026-04-19T03:00:23Z

thread 'util::local_poll_adapter::tests::deferred_success' (9628) panicked at src/cargo/util/local_poll_adapter.rs:177:9:

Rerunning

Should be fixed by #16909

Update cargo submodule 28 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..7ecf0285ebb408d596e4a8ac76a0980d8edb7005 2026-04-09 13:10:20 +0000 to 2026-04-18 15:34:11 +0000 - fix: use `portable-atomic` for 64-bit atomics (rust-lang/cargo#16906) - fix: rename incorrectly documented target-spec-json to json-target-sp… (rust-lang/cargo#16905) - Add global HTTP timeout tracking to http_async (rust-lang/cargo#16903) - feat(config): Stabilize `resolver.lockfile-path` config (rust-lang/cargo#16694) - chore(deps): update msrv (1 version) to v1.95 (rust-lang/cargo#16897) - fix: rebuild rustdoc json for different versions of a same crate (rust-lang/cargo#16773) - Add effective_url to http_async (rust-lang/cargo#16899) - Make crate downloads process as a queue rather than a stack (rust-lang/cargo#16898) - fix: sparse registry fetch progress reporting (rust-lang/cargo#16900) - chore: bump to 0.98.0; update changelog (rust-lang/cargo#16892) - docs(semver-check): update diagnostics to Rust 1.95 (rust-lang/cargo#16895) - docs(ref): Better highlight 'package --list' for include/exclude (rust-lang/cargo#16891) - docs: `include` doesnt apply gitignore from repo (rust-lang/cargo#16890) - fix: Update `bash` and `zsh` Autocompletion Documents to add `-m` (rust-lang/cargo#16888) - Add `-m` shorthand for `--manifest-path` (rust-lang/cargo#16858) - Fix a typo (rust-lang/cargo#16885) - Always take a shared lock on `.cargo-lock` (rust-lang/cargo#16886) - fix(toml): Teach users how to pin edition (rust-lang/cargo#16851) - fix: Prefer defined lint levels over default (rust-lang/cargo#16879) - chore(deps): bump rand from 0.10.0 to 0.10.1 (rust-lang/cargo#16883) - fix(lints): Ignore unused_crate_dependencies status (rust-lang/cargo#16877) - Copy cargo clean target-dir validation tests to clean_new_layout.rs (rust-lang/cargo#16878) - cargo clean: Add target directory validation (rust-lang/cargo#16712) - Docs: "api" in the configuration should not include a trailing slash (rust-lang/cargo#16869) - fix(core): use `closest_msg` to suggest similar member name for mistyped `-p` (rust-lang/cargo#16844) - chore(ci): Pin GitHub Actions to commit SHAs (rust-lang/cargo#16868) - chore(ci): Update `actions/checkout` from v5 to v6 (rust-lang/cargo#16867) - Add test for cargo install with github fastpath (rust-lang/cargo#16866)

weihanglo added 5 commits April 18, 2026 09:46

chore: enable disallowed_types lint

a31bfbf

We added this configuration but forgot to enabled it in lints See rust-lang#12988

chore: disallow AtomicI64 also

d5c6b62

refactor(cargo-util): move to portable-atomic

08f5545

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)

chore: remove target_has_atomic gate from tracing-chrome

21bcb1d

`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>

rustbot assigned epage Apr 18, 2026

epage approved these changes Apr 18, 2026

View reviewed changes

epage enabled auto-merge April 18, 2026 14:32

epage added this pull request to the merge queue Apr 18, 2026

Merged via the queue into rust-lang:master with commit 7ecf028 Apr 18, 2026
47 of 60 checks passed

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 2026

weihanglo mentioned this pull request Apr 18, 2026

Update cargo submodule rust-lang/rust#155470

Merged

weihanglo deleted the atomic64 branch April 18, 2026 17:49

rustbot added this to the 1.97.0 milestone Apr 19, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use `portable-atomic` for 64-bit atomics#16906

fix: use `portable-atomic` for 64-bit atomics#16906
epage merged 5 commits intorust-lang:masterfrom
weihanglo:atomic64

weihanglo commented Apr 18, 2026

Uh oh!

rustbot commented Apr 18, 2026

Uh oh!

weihanglo commented Apr 18, 2026

Uh oh!

Uh oh!

arlosi commented Apr 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

weihanglo commented Apr 18, 2026

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

rustbot commented Apr 18, 2026

Uh oh!

weihanglo commented Apr 18, 2026

Uh oh!

Uh oh!

arlosi commented Apr 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants