Skip to content

Update cargo submodule#155470

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo
Apr 19, 2026
Merged

Update cargo submodule#155470
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo

Conversation

@weihanglo
Copy link
Copy Markdown
Member

@weihanglo weihanglo commented Apr 18, 2026

View all comments

28 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..7ecf0285ebb408d596e4a8ac76a0980d8edb7005
2026-04-09 13:10:20 +0000 to 2026-04-18 15:34:11 +0000

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 18, 2026

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 18, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 18, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 18, 2026

📌 Commit 532a952 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 18, 2026
Update cargo submodule

26 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..3bf1388b8823ec4eab622340036593381d8871aa
2026-04-09 13:10:20 +0000 to 2026-04-17 23:27:26 +0000
- 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)

r? ghost
@rust-log-analyzer

This comment has been minimized.

@rust-bors rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 18, 2026

💔 Test for cb7913a failed: CI. Failed job:

weihanglo added a commit to weihanglo/cargo that referenced this pull request Apr 18, 2026
`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)
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Apr 18, 2026
### 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

* https://triage.rust-lang.org/gha-logs/rust-lang/rust/71938527712
* rust-lang/rust#155470

This also removes some other unnecessary AtomicU64 gates in

* cargo-util
* tracing-chrome

### How to test and review this PR?
@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2026
@weihanglo
Copy link
Copy Markdown
Member Author

@bors try jobs=dist-powerpc-linux

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 18, 2026
Update cargo submodule


try-job: dist-powerpc-linux
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 18, 2026

☀️ Try build successful (CI)
Build commit: 54a07c1 (54a07c1b0064c991cbfa3b56af2a5af6051587f0, parent: 3142beae24ddd6b7fd68e49e227bebf79181f9e4)

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 18, 2026

📌 Commit d786ba8 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 18, 2026
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)
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] build_script_build test:false 1.012
   Compiling tempfile v3.23.0
error: linking with `cc` failed: exit status: 1
  |
  = note:  "cc" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-rustc/release/build/stacker-7164454b781aece0/rustclB6fmU/symbols.o" "<2 object files omitted>" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-rustc/release/deps/{libcc-3285afb4b9dd6dac,libshlex-10c1650d67c6912b}.rlib" "<sysroot>/lib/rustlib/aarch64-apple-darwin/lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libcfg_if-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,liblibc-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "-lSystem" "-lc" "-lm" "-arch" "arm64" "-mmacosx-version-min=11.0.0" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage1-rustc/release/build/stacker-7164454b781aece0/build_script_build-7164454b781aece0" "-Wl,-dead_strip" "-nodefaultlibs"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: clang: error: unable to execute command: Segmentation fault: 11
          clang: error: linker command failed due to signal (use -v to see invocation)
          Apple clang version 17.0.0 (clang-1700.6.3.2)
          Target: arm64-apple-darwin24.6.0
          Thread model: posix
          InstalledDir: /Applications/Xcode_26.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
          clang: note: diagnostic msg: 
          ********************
          
          PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
          Linker snapshot containing input(s) and associated run script(s) are located at:
          clang: note: diagnostic msg: /var/folders/tb/y368xp_x10s3ty1b_mtl5mxr0000gn/T/linker-crash-017145
          clang: note: diagnostic msg: 
          
          ********************
          

[RUSTC-TIMING] build_script_build test:false 1.872

@rust-bors rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 18, 2026

💔 Test for 296747c failed: CI. Failed job:

@weihanglo
Copy link
Copy Markdown
Member Author

clang: error: unable to execute command: Segmentation fault: 11

Unrelated I believe.

@bors retry

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 19, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 19, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 19, 2026

☀️ Test successful - CI
Approved by: weihanglo
Duration: 3h 11m 57s
Pushing ec2d669 to main...

@rust-bors rust-bors bot merged commit ec2d669 into rust-lang:main Apr 19, 2026
13 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 19, 2026
@github-actions
Copy link
Copy Markdown
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 6f109d8 (parent) -> ec2d669 (this PR)

Test differences

Show 48 test diffs

Stage 2

  • build::cargo_compile_with_manifest_path_shorthand: [missing] -> pass (J0)
  • build_dir::cargo_rustdoc_json_should_output_to_target_dir: [missing] -> ignore (--output-format is unstable) (J0)
  • build_dir_legacy::cargo_rustdoc_json_should_output_to_target_dir: [missing] -> ignore (--output-format is unstable) (J0)
  • clean::config_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean::config_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean::config_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean::config_target_dir_tag_valid: [missing] -> pass (J0)
  • clean::env_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean::env_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean::env_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean::env_target_dir_tag_valid: [missing] -> pass (J0)
  • clean::explicit_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean::explicit_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean::explicit_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean::explicit_target_dir_tag_valid: [missing] -> pass (J0)
  • clean_new_layout::config_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean_new_layout::config_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean_new_layout::config_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean_new_layout::config_target_dir_tag_valid: [missing] -> pass (J0)
  • clean_new_layout::env_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean_new_layout::env_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean_new_layout::env_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean_new_layout::env_target_dir_tag_valid: [missing] -> pass (J0)
  • clean_new_layout::explicit_target_dir_tag_invalid_signature: [missing] -> pass (J0)
  • clean_new_layout::explicit_target_dir_tag_not_present: [missing] -> pass (J0)
  • clean_new_layout::explicit_target_dir_tag_symlink: [missing] -> pass (J0)
  • clean_new_layout::explicit_target_dir_tag_valid: [missing] -> pass (J0)
  • https::github_works_cargo_install: [missing] -> ignore (CARGO_PUBLIC_NETWORK_TESTS must be set) (J0)
  • lints::explicit_lint_level_overrides_default: [missing] -> pass (J0)
  • lints::tests::lint_level_group_overrides_default: [missing] -> pass (J0)
  • lints::tests::lint_level_prefers_user_specified_over_default: [missing] -> pass (J0)
  • lints::unused_dependencies::allow_attribute: [missing] -> pass (J0)
  • lints::unused_dependencies::allow_rustflags: [missing] -> pass (J0)
  • lints::unused_dependencies::deny_attribute: [missing] -> pass (J0)
  • lints::unused_dependencies::deny_rustflags: [missing] -> pass (J0)
  • lints::unused_dependencies::forbid_attribute: [missing] -> pass (J0)
  • lints::unused_dependencies::forbid_rustflags: [missing] -> pass (J0)
  • lockfile_path::config_lockfile_path_without_z_flag: pass -> [missing] (J0)
  • package_features::non_member_typo: [missing] -> pass (J0)
  • rustdoc::rustdoc_json_same_crate_different_version: [missing] -> ignore (--output-format is unstable) (J0)
  • rustdoc::rustdoc_json_with_new_layout: [missing] -> ignore (--output-format is unstable) (J0)

Additionally, 7 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard ec2d669db8e5ca2cb1604c69a831ef244ebd9aa9 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. pr-check-2: 44m 11s -> 31m 27s (-28.8%)
  2. dist-x86_64-illumos: 1h 24m -> 1h 48m (+27.8%)
  3. dist-apple-various: 1h 43m -> 2h 10m (+26.0%)
  4. test-various: 2h 7m -> 1h 35m (-25.1%)
  5. x86_64-msvc-ext1: 2h 15m -> 1h 41m (-25.0%)
  6. dist-i586-gnu-i586-i686-musl: 1h 15m -> 1h 34m (+24.9%)
  7. dist-i686-linux: 1h 27m -> 1h 48m (+24.4%)
  8. x86_64-gnu-llvm-21-1: 57m 1s -> 1h 9m (+22.3%)
  9. x86_64-msvc-2: 2h 29m -> 1h 56m (-22.1%)
  10. x86_64-gnu-debug: 1h 52m -> 1h 27m (-22.1%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (ec2d669): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 3.4%, secondary 2.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
3.4% [3.4%, 3.4%] 1
Regressions ❌
(secondary)
2.3% [2.0%, 2.5%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.4% [3.4%, 3.4%] 1

Cycles

Results (secondary 2.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.4% [2.4%, 2.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 491.328s -> 490.129s (-0.24%)
Artifact size: 394.27 MiB -> 394.32 MiB (0.01%)

@weihanglo weihanglo deleted the update-cargo branch April 19, 2026 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants