Skip to content

Update cargo submodule#154734

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
weihanglo:update-cargo
Apr 7, 2026
Merged

Update cargo submodule#154734
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
weihanglo:update-cargo

Conversation

@weihanglo
Copy link
Copy Markdown
Member

@weihanglo weihanglo commented Apr 2, 2026

View all comments

15 commits in 888f675344eb1cf2308fd53183e667bdd2c58e51..a357df4c26fc14514e66aae2a269456b5545c7db
2026-03-30 16:59:25 +0000 to 2026-04-03 16:47:15 +0000

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 2, 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 2, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 2, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Copy Markdown
Member Author

rust-lang/cargo#16745 is huge enough so want to get this to nightly ASAP to get a longer test window before hitting stable.

@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 2, 2026

📌 Commit b4f3f26 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 2, 2026
@rust-bors

This comment has been minimized.

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

12 commits in 888f675344eb1cf2308fd53183e667bdd2c58e51..0c7d80bf5ad3b873a5dbf44e0185152890c6d18a
2026-03-30 16:59:25 +0000 to 2026-04-02 20:48:06 +0000
- refactor(network): use async for registry network operations (rust-lang/cargo#16745)
- fix(compile): Don't hide hard warnings with build.warnings=allow (rust-lang/cargo#16827)
- chore: Upgrade incompatible dependencies (rust-lang/cargo#16825)
- fix(compile): build.warnings=allow should not hide denied diagnostics (rust-lang/cargo#16824)
- fix(install): Ignore resolver.lockfile-path (rust-lang/cargo#16823)
- chore(deps): update compatible (rust-lang/cargo#16820)
- refactor(compile): Consolidate output options (rust-lang/cargo#16821)
- refactor: Export public dependencies from internal crates (rust-lang/cargo#16819)
- refactor(progress): Make the code more approachable (rust-lang/cargo#16813)
- Simplified build script bin names in new layout (rust-lang/cargo#16812)
- fix: set CARGO env var during rustc -vV probe (rust-lang/cargo#16811)
- Split out `cargo-util-terminal` (rust-lang/cargo#16809)

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 3, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 3, 2026

💔 Test for 9814779 failed: CI. Failed job:

weihanglo added a commit to weihanglo/libz-sys that referenced this pull request Apr 3, 2026
This follows upstream's change in madler/zlib@1382e6611
due to EWOULDBLOCK is used since madler/zlib@81cc0bebe
and `-D_POSIX_SOURCE` would hide `#define EWOULDBLOCK EAGAIN`.

See <https://github.com/freebsd/freebsd-src/blob/3e9f4fd6fc50300d052d5619d82a14d3488483d5/sys/sys/errno.h#L92-L93>

Actually I feel like _POSIX_C_SOURCE=200112L maybe redundant
though let's just do whatever upstream does

This was found in

* <rust-lang/rust#154734>
* <https://triage.rust-lang.org/gha-logs/rust-lang/rust/69786578177>
@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 3, 2026
@rust-log-analyzer

This comment has been minimized.

@weihanglo
Copy link
Copy Markdown
Member Author

Going to try freebsd with my libz-sys change weihanglo/libz-sys@73817ec.

Since it is a relatively domain I am not really familiar with, I'll try more tier 2 with host tools platforms.

@bors try jobs=dist-x86_64-freebsd,dist-x86_64-illumos,dist-x86_64-netbsd,dist-x86_64-solaris,dist-x86_64-apple,dist-powerpc-linux-gnu,dist-riscv64-linux

@rust-bors

This comment has been minimized.

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


try-job: dist-x86_64-freebsd
try-job: dist-x86_64-illumos
try-job: dist-x86_64-netbsd
try-job: dist-x86_64-solaris
try-job: dist-x86_64-apple
try-job: dist-powerpc-linux-gnu
try-job: dist-riscv64-linux
@rust-bors

This comment was marked as outdated.

@rust-log-analyzer

This comment was marked as outdated.

@rust-log-analyzer

This comment was marked as outdated.

@weihanglo
Copy link
Copy Markdown
Member Author

Oops. #154734 (comment) failed. Try again.

@bors try jobs=dist-x86_64-freebsd,dist-x86_64-illumos,dist-x86_64-netbsd,dist-x86_64-solaris,dist-x86_64-apple,dist-powerpc-linux,dist-riscv64-linux

@rust-bors

This comment has been minimized.

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


try-job: dist-x86_64-freebsd
try-job: dist-x86_64-illumos
try-job: dist-x86_64-netbsd
try-job: dist-x86_64-solaris
try-job: dist-x86_64-apple
try-job: dist-powerpc-linux
try-job: dist-riscv64-linux
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 3, 2026

☀️ Try build successful (CI)
Build commit: 8c77a37 (8c77a3707198188bc872d9145a42878cb18cf425, parent: 55e86c996809902e8bbad512cfb4d2c18be446d9)

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



15 commits in 888f675344eb1cf2308fd53183e667bdd2c58e51..a357df4c26fc14514e66aae2a269456b5545c7db
2026-03-30 16:59:25 +0000 to 2026-04-03 16:47:15 +0000
- chore: downgrade to libz-sys@1.1.24 (rust-lang/cargo#16833)
- feat: add frame-pointers profile option (rust-lang/cargo#16742)
- upgrade to gix@0.81.0 (rust-lang/cargo#16828)
- refactor(network): use async for registry network operations (rust-lang/cargo#16745)
- fix(compile): Don't hide hard warnings with build.warnings=allow (rust-lang/cargo#16827)
- chore: Upgrade incompatible dependencies (rust-lang/cargo#16825)
- fix(compile): build.warnings=allow should not hide denied diagnostics (rust-lang/cargo#16824)
- fix(install): Ignore resolver.lockfile-path (rust-lang/cargo#16823)
- chore(deps): update compatible (rust-lang/cargo#16820)
- refactor(compile): Consolidate output options (rust-lang/cargo#16821)
- refactor: Export public dependencies from internal crates (rust-lang/cargo#16819)
- refactor(progress): Make the code more approachable (rust-lang/cargo#16813)
- Simplified build script bin names in new layout (rust-lang/cargo#16812)
- fix: set CARGO env var during rustc -vV probe (rust-lang/cargo#16811)
- Split out `cargo-util-terminal` (rust-lang/cargo#16809)
@weihanglo
Copy link
Copy Markdown
Member Author

weihanglo commented Apr 6, 2026

BTW I've tried 20 times with and without the patch,

  • With MFLAGS patch, 0/20 hung.
  • Without, 9/20 hung

So thanks Arlo for the fix!

@arlosi
Copy link
Copy Markdown
Contributor

arlosi commented Apr 7, 2026

Seems stuck in dist-x86_64-linux building LLVM. All other jobs succeeded.

Last lines of output are:

  -- Installing: /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/include/llvm/BinaryFormat/MsgPack.def
  -- Installing: /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/include/llvm/BinaryFormat/MsgPack.h
  -- Installing: /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/include/llvm/BinaryFormat/MsgPackDocument.h
  -- Installing: /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/include/llvm/BinaryFormat/MsgPackReader.h

By comparing to a successful run, there are still more files for the LLVM build to install.

Since the LLVM build seems unrelated to updating cargo:

@bors retry

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

❗ You can only retry pull requests that are approved and have a previously failed auto build.

Hint: There is currently a pending auto build on this PR. To cancel it, run @bors cancel.

@weihanglo
Copy link
Copy Markdown
Member Author

@bors cancel

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #154734.

@rust-bors

This comment has been minimized.

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



15 commits in 888f675344eb1cf2308fd53183e667bdd2c58e51..a357df4c26fc14514e66aae2a269456b5545c7db
2026-03-30 16:59:25 +0000 to 2026-04-03 16:47:15 +0000
- chore: downgrade to libz-sys@1.1.24 (rust-lang/cargo#16833)
- feat: add frame-pointers profile option (rust-lang/cargo#16742)
- upgrade to gix@0.81.0 (rust-lang/cargo#16828)
- refactor(network): use async for registry network operations (rust-lang/cargo#16745)
- fix(compile): Don't hide hard warnings with build.warnings=allow (rust-lang/cargo#16827)
- chore: Upgrade incompatible dependencies (rust-lang/cargo#16825)
- fix(compile): build.warnings=allow should not hide denied diagnostics (rust-lang/cargo#16824)
- fix(install): Ignore resolver.lockfile-path (rust-lang/cargo#16823)
- chore(deps): update compatible (rust-lang/cargo#16820)
- refactor(compile): Consolidate output options (rust-lang/cargo#16821)
- refactor: Export public dependencies from internal crates (rust-lang/cargo#16819)
- refactor(progress): Make the code more approachable (rust-lang/cargo#16813)
- Simplified build script bin names in new layout (rust-lang/cargo#16812)
- fix: set CARGO env var during rustc -vV probe (rust-lang/cargo#16811)
- Split out `cargo-util-terminal` (rust-lang/cargo#16809)
@weihanglo
Copy link
Copy Markdown
Member Author

Ah. I thought it told us to cancel 😰.

@arlosi
Copy link
Copy Markdown
Contributor

arlosi commented Apr 7, 2026

Cancelling it caused more logs to make it through. Last log before it hung was:

  Executing benchmark cargo-0.87.1 (2/9)
  Preparing cargo-0.87.1
  Error: The operation was canceled.

Which does seem cargo related.

@bors r-

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 7, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

This pull request was unapproved.

Auto build was cancelled due to unapproval. Cancelled workflows:

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented Apr 7, 2026

Which does seem cargo related.

I'm pretty sure this does not use the in-tree cargo. This is running a benchmark against an old clone of cargo (cargo-0.87.1) compiling that old cargo, using stage2 rustc and stage0 cargo.

@weihanglo
Copy link
Copy Markdown
Member Author

Yeah, so let's just try again

@bors retry

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

❗ You can only retry pull requests that are approved and have a previously failed auto build.

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

📌 Commit 34e4100 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 7, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors p=1
Resetting the scheduling

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors p=6
Scheduling this in front of the rollup so the rollup try jobs get a bit more time

@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 7, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

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

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

github-actions bot commented Apr 7, 2026

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 c3bd628 (parent) -> ad4b935 (this PR)

Test differences

Show 18 test diffs

Stage 2

  • build::rustc_wrapper_vv_probe_has_cargo_env: [missing] -> pass (J0)
  • lockfile_path::config_install_ignores_lock_file_path: [missing] -> pass (J0)
  • lockfile_path::config_install_lock_file_path_must_present: pass -> [missing] (J0)
  • lockfile_path::config_install_respects_lock_file_path: pass -> [missing] (J0)
  • profiles::frame_pointers_default_overrides_parent: [missing] -> pass (J0)
  • profiles::frame_pointers_force_off: [missing] -> pass (J0)
  • profiles::frame_pointers_force_on: [missing] -> pass (J0)
  • profiles::frame_pointers_invalid_value: [missing] -> pass (J0)
  • profiles::frame_pointers_unspecified: [missing] -> pass (J0)
  • util::local_poll_adapter::tests::deferred_error: [missing] -> pass (J0)
  • util::local_poll_adapter::tests::deferred_success: [missing] -> pass (J0)
  • util::local_poll_adapter::tests::immediate_error: [missing] -> pass (J0)
  • util::local_poll_adapter::tests::immediate_success: [missing] -> pass (J0)
  • warning_override::always_show_error_diags: [missing] -> pass (J0)

Additionally, 4 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 ad4b9354009cb6bd5a9ff1b5f5a63a13ec98ebc9 --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. dist-powerpc-linux: 1h 30m -> 1h 11m (-21.7%)
  2. pr-check-1: 32m 31s -> 26m 15s (-19.3%)
  3. aarch64-apple: 3h 28m -> 2h 51m (-17.8%)
  4. dist-x86_64-apple: 1h 47m -> 2h 6m (+17.5%)
  5. x86_64-gnu-tools: 1h 2m -> 53m 46s (-14.5%)
  6. dist-aarch64-msvc: 1h 46m -> 1h 32m (-13.2%)
  7. pr-check-2: 44m 42s -> 39m 13s (-12.3%)
  8. aarch64-gnu-llvm-21-2: 53m 16s -> 46m 45s (-12.2%)
  9. x86_64-gnu-gcc: 1h 12m -> 1h 3m (-11.6%)
  10. x86_64-gnu-aux: 2h 28m -> 2h 12m (-11.2%)
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 (ad4b935): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
-0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

Max RSS (memory usage)

Results (primary 4.8%, secondary -5.2%)

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

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

Cycles

Results (secondary -3.9%)

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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.9% [-3.9%, -3.9%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary -0.1%, secondary 0.1%)

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

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.1%] 8
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 4
Improvements ✅
(primary)
-0.2% [-0.4%, -0.1%] 8
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-0.4%, 0.1%] 16

Bootstrap: 487.084s -> 488.293s (0.25%)
Artifact size: 395.18 MiB -> 395.52 MiB (0.08%)

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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants