Skip to content

Update cargo #145478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
Merged

Update cargo #145478

merged 1 commit into from
Aug 18, 2025

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Aug 16, 2025

28 commits in 840b83a10fb0e039a83f4d70ad032892c287570a..71eb84f21aef43c07580c6aed6f806a6299f5042
2025-07-30 13:59:19 +0000 to 2025-08-17 17:18:56 +0000

@weihanglo weihanglo self-assigned this Aug 16, 2025
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 16, 2025

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot
Copy link
Collaborator

rustbot commented Aug 16, 2025

⚠️ Warning ⚠️

@weihanglo
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Aug 16, 2025

📌 Commit fbcca5f has been approved by weihanglo

It is now in the queue for this repository.

@bors bors 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 Aug 16, 2025
@bors
Copy link
Collaborator

bors commented Aug 16, 2025

⌛ Testing commit fbcca5f with merge 4570ab6...

bors added a commit that referenced this pull request Aug 16, 2025
Update cargo

23 commits in 840b83a10fb0e039a83f4d70ad032892c287570a..9a0712751ca9444775c7352d3c942a155b656437
2025-07-30 13:59:19 +0000 to 2025-08-15 20:30:47 +0000
- Fixes error while running the cargo clippy --all-targets -- -D warning (rust-lang/cargo#15843)
- Clarify that `cargo doc --no-deps` is cumulative and won’t delete prev (rust-lang/cargo#15800)
- docs: Formatting and cross-linking to build-dir/target-dir docs (rust-lang/cargo#15840)
- Stabilize `build.build-dir` (rust-lang/cargo#15833)
- make resolve features public for cargo-as-a-library (rust-lang/cargo#15835)
- chore(deps): bump slab from 0.4.10 to 0.4.11 (rust-lang/cargo#15832)
- chore: remove x86_64-apple-darwin from CI and tests (rust-lang/cargo#15831)
- chore(deps): update msrv (3 versions) to v1.87 (rust-lang/cargo#15819)
- perf(package): Always reuse the workspace's target-dir (rust-lang/cargo#15783)
- More helpful error for invalid cargo-features = [] (rust-lang/cargo#15781)
- Add initial integration for `--json=timings` behing `-Zsection-timings` (rust-lang/cargo#15780)
- add is_inherited methods to InheritableDependency and InheritableField (rust-lang/cargo#15828)
- chore(deps): update compatible (rust-lang/cargo#15804)
- docs(unstable): Link out to the Plumbing commands effort (rust-lang/cargo#15821)
- chore(deps): update cargo-semver-checks to v0.43.0 (rust-lang/cargo#15825)
- test(build-std): relax the thread name assertion (rust-lang/cargo#15822)
- chore(deps): update msrv (1 version) to v1.89 (rust-lang/cargo#15815)
- Update semver tests for 1.89 (rust-lang/cargo#15816)
- Accessing each build script's `OUT_DIR` and in the correct order (rust-lang/cargo#15776)
- chore: bump to 0.92.0; update changelog (rust-lang/cargo#15807)
- docs: `-Zpackage-workspace` has been stabilized (rust-lang/cargo#15808)
- chore(deps): update rust crate cargo_metadata to 0.21.0 (rust-lang/cargo#15795)
- docs(build-rs): Fix broken intra-doc links (rust-lang/cargo#15810)

r? ghost
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Aug 16, 2025

💔 Test failed - checks-actions

@bors bors 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 Aug 16, 2025
weihanglo added a commit to weihanglo/cargo that referenced this pull request Aug 17, 2025
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Aug 17, 2025
### What does this PR try to resolve?

There is incompatibility between [email protected] and [email protected] that
leads to compilation errors.

See

* bytecodealliance/rustix#1496
* rust-lang/rust#145478 (comment)

### How to test and review this PR?

In rust-lang/rust, update the `src/tools/cargo` submodule accordingly,
and run

```
cargo run --manifest-path src/ci/citool/Cargo.toml run-local dist-loongarch64-musl
```

With this downgrade it should compile.
@weihanglo
Copy link
Member Author

rust-lang/cargo#15851 should unblock loongarch64.

@bors retry

@bors bors 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 Aug 17, 2025
@weihanglo
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Aug 17, 2025

📌 Commit 08263c9 has been approved by weihanglo

It is now in the queue for this repository.

bors added a commit that referenced this pull request Aug 17, 2025
Update cargo

28 commits in 840b83a10fb0e039a83f4d70ad032892c287570a..71eb84f21aef43c07580c6aed6f806a6299f5042
2025-07-30 13:59:19 +0000 to 2025-08-17 17:18:56 +0000
- update tests to match lint message changes from #140794 (rust-lang/cargo#15849)
- chore: downgrade to [email protected] (rust-lang/cargo#15851)
- Reorder `lto` options in profiles.md (rust-lang/cargo#15841)
- feat(unstable): add -Zbuild-analysis unstable feature (rust-lang/cargo#15845)
- refactor(unstable): group stabilized features (rust-lang/cargo#15846)
- Fixes error while running the cargo clippy --all-targets -- -D warning (rust-lang/cargo#15843)
- Clarify that `cargo doc --no-deps` is cumulative and won’t delete prev (rust-lang/cargo#15800)
- docs: Formatting and cross-linking to build-dir/target-dir docs (rust-lang/cargo#15840)
- Stabilize `build.build-dir` (rust-lang/cargo#15833)
- make resolve features public for cargo-as-a-library (rust-lang/cargo#15835)
- chore(deps): bump slab from 0.4.10 to 0.4.11 (rust-lang/cargo#15832)
- chore: remove x86_64-apple-darwin from CI and tests (rust-lang/cargo#15831)
- chore(deps): update msrv (3 versions) to v1.87 (rust-lang/cargo#15819)
- perf(package): Always reuse the workspace's target-dir (rust-lang/cargo#15783)
- More helpful error for invalid cargo-features = [] (rust-lang/cargo#15781)
- Add initial integration for `--json=timings` behing `-Zsection-timings` (rust-lang/cargo#15780)
- add is_inherited methods to InheritableDependency and InheritableField (rust-lang/cargo#15828)
- chore(deps): update compatible (rust-lang/cargo#15804)
- docs(unstable): Link out to the Plumbing commands effort (rust-lang/cargo#15821)
- chore(deps): update cargo-semver-checks to v0.43.0 (rust-lang/cargo#15825)
- test(build-std): relax the thread name assertion (rust-lang/cargo#15822)
- chore(deps): update msrv (1 version) to v1.89 (rust-lang/cargo#15815)
- Update semver tests for 1.89 (rust-lang/cargo#15816)
- Accessing each build script's `OUT_DIR` and in the correct order (rust-lang/cargo#15776)
- chore: bump to 0.92.0; update changelog (rust-lang/cargo#15807)
- docs: `-Zpackage-workspace` has been stabilized (rust-lang/cargo#15808)
- chore(deps): update rust crate cargo_metadata to 0.21.0 (rust-lang/cargo#15795)
- docs(build-rs): Fix broken intra-doc links (rust-lang/cargo#15810)
@bors
Copy link
Collaborator

bors commented Aug 17, 2025

⌛ Testing commit 08263c9 with merge 689491c...

@bors
Copy link
Collaborator

bors commented Aug 18, 2025

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 18, 2025
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 18, 2025
bors added a commit that referenced this pull request Aug 18, 2025
Update cargo

28 commits in 840b83a10fb0e039a83f4d70ad032892c287570a..71eb84f21aef43c07580c6aed6f806a6299f5042
2025-07-30 13:59:19 +0000 to 2025-08-17 17:18:56 +0000
- update tests to match lint message changes from #140794 (rust-lang/cargo#15849)
- chore: downgrade to [email protected] (rust-lang/cargo#15851)
- Reorder `lto` options in profiles.md (rust-lang/cargo#15841)
- feat(unstable): add -Zbuild-analysis unstable feature (rust-lang/cargo#15845)
- refactor(unstable): group stabilized features (rust-lang/cargo#15846)
- Fixes error while running the cargo clippy --all-targets -- -D warning (rust-lang/cargo#15843)
- Clarify that `cargo doc --no-deps` is cumulative and won’t delete prev (rust-lang/cargo#15800)
- docs: Formatting and cross-linking to build-dir/target-dir docs (rust-lang/cargo#15840)
- Stabilize `build.build-dir` (rust-lang/cargo#15833)
- make resolve features public for cargo-as-a-library (rust-lang/cargo#15835)
- chore(deps): bump slab from 0.4.10 to 0.4.11 (rust-lang/cargo#15832)
- chore: remove x86_64-apple-darwin from CI and tests (rust-lang/cargo#15831)
- chore(deps): update msrv (3 versions) to v1.87 (rust-lang/cargo#15819)
- perf(package): Always reuse the workspace's target-dir (rust-lang/cargo#15783)
- More helpful error for invalid cargo-features = [] (rust-lang/cargo#15781)
- Add initial integration for `--json=timings` behing `-Zsection-timings` (rust-lang/cargo#15780)
- add is_inherited methods to InheritableDependency and InheritableField (rust-lang/cargo#15828)
- chore(deps): update compatible (rust-lang/cargo#15804)
- docs(unstable): Link out to the Plumbing commands effort (rust-lang/cargo#15821)
- chore(deps): update cargo-semver-checks to v0.43.0 (rust-lang/cargo#15825)
- test(build-std): relax the thread name assertion (rust-lang/cargo#15822)
- chore(deps): update msrv (1 version) to v1.89 (rust-lang/cargo#15815)
- Update semver tests for 1.89 (rust-lang/cargo#15816)
- Accessing each build script's `OUT_DIR` and in the correct order (rust-lang/cargo#15776)
- chore: bump to 0.92.0; update changelog (rust-lang/cargo#15807)
- docs: `-Zpackage-workspace` has been stabilized (rust-lang/cargo#15808)
- chore(deps): update rust crate cargo_metadata to 0.21.0 (rust-lang/cargo#15795)
- docs(build-rs): Fix broken intra-doc links (rust-lang/cargo#15810)
@bors
Copy link
Collaborator

bors commented Aug 18, 2025

⌛ Testing commit 08263c9 with merge 6e37e9a...

@Zalathar
Copy link
Contributor

Zalathar commented Aug 18, 2025

The i686-msvc-1 job seems to be stuck on “wait for Windows disk cleanup to finish”, and hasn't started the actual build. 😕

(I'm assuming that's more CI/runner flakiness, unrelated to any particular changes.)

https://github.com/rust-lang/rust/actions/runs/17030877518

@Zalathar
Copy link
Contributor

Even if this job spontaneously becomes unstuck, it's still not going to finish in under 6 hours. Better to reroll the CI dice now.

@bors retry

@Zalathar
Copy link
Contributor

Failed in rollup: #145552 (comment)

@bors r-
@rustbot blocked (needs #145478)

@rustbot rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Aug 18, 2025
@bors bors 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. S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Aug 18, 2025
@Zalathar
Copy link
Contributor

Whoops, didn't mean to do that to this PR.

@bors r=weihanglo

@bors
Copy link
Collaborator

bors commented Aug 18, 2025

📌 Commit 08263c9 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors 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 Aug 18, 2025
@weihanglo
Copy link
Member Author

weihanglo commented Aug 18, 2025

The i686-msvc-1 job seems to be stuck on “wait for Windows disk cleanup to finish”, and hasn't started the actual build. 😕

(I'm assuming that's more CI/runner flakiness, unrelated to any particular changes.)

rust-lang/rust/actions/runs/17030877518

actions/runner#3792 maybe?

I don't know how self-hosted runners and Actions talk to each other though

@bors
Copy link
Collaborator

bors commented Aug 18, 2025

⌛ Testing commit 08263c9 with merge aaf87a6...

@bors
Copy link
Collaborator

bors commented Aug 18, 2025

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing aaf87a6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 18, 2025
@bors bors merged commit aaf87a6 into rust-lang:master Aug 18, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 18, 2025
@weihanglo weihanglo deleted the update-cargo branch August 18, 2025 19:32
Copy link
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 239e8b1 (parent) -> aaf87a6 (this PR)

Test differences

Show 10 test diffs

Stage 2

  • build_analysis::gated: [missing] -> pass (J0)
  • build_analysis::simple: [missing] -> pass (J0)
  • build_dir::verify_build_dir_is_disabled_by_feature_flag: pass -> [missing] (J0)
  • build_scripts_multiple::build_script_with_conflicts_reverse_sorted: [missing] -> pass (J0)
  • cargo_features::feature_syntax: [missing] -> pass (J0)
  • cargo_features::wrong_kind_of_feature: [missing] -> pass (J0)
  • package::package_should_use_build_cache: [missing] -> pass (J0)

Additionally, 3 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 aaf87a6d289053246d19f94fbc9972582816e93d --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-apple-various: 5198.4s -> 6812.6s (31.1%)
  2. dist-x86_64-apple: 16279.0s -> 12572.4s (-22.8%)
  3. x86_64-apple-1: 10500.6s -> 8238.2s (-21.5%)
  4. x86_64-apple-2: 6905.2s -> 7703.7s (11.6%)
  5. x86_64-msvc-ext2: 6052.5s -> 6627.6s (9.5%)
  6. dist-aarch64-msvc: 5842.3s -> 5308.7s (-9.1%)
  7. aarch64-msvc-1: 7416.7s -> 6839.8s (-7.8%)
  8. x86_64-mingw-2: 8180.2s -> 7556.2s (-7.6%)
  9. aarch64-gnu-llvm-19-1: 3291.9s -> 3511.5s (6.7%)
  10. x86_64-gnu-llvm-19-2: 5697.1s -> 6076.7s (6.7%)
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
Collaborator

Finished benchmarking commit (aaf87a6): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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)
1.1% [1.0%, 1.2%] 2
Regressions ❌
(secondary)
1.1% [1.1%, 1.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.4%, -0.3%] 7
All ❌✅ (primary) 1.1% [1.0%, 1.2%] 2

Max RSS (memory usage)

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

Cycles

Results (primary 2.3%, secondary 4.1%)

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

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

Binary size

Results (secondary -0.0%)

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

Bootstrap: 470.133s -> 472.035s (0.40%)
Artifact size: 377.59 MiB -> 377.77 MiB (0.05%)

@rustbot rustbot added the perf-regression Performance regression. label Aug 18, 2025
@Mark-Simulacrum Mark-Simulacrum removed the perf-regression Performance regression. label Aug 19, 2025
@Mark-Simulacrum
Copy link
Member

Hard to be 100% confident given recency, but I'm pretty sure this is just bimodality. Cargo shouldn't have much practical relation to rustc perf anyway, assuming we don't tweak codegen/rustc flags (and I don't see that in the diff above).

@weihanglo
Copy link
Member Author

I didn't see anything outstanding. Could be rust-lang/cargo#15804 that updating some dependencies (like toml?). [email protected] does have a 200+ lines of Cargo.toml, though I am not sure if it really caused the regression: https://docs.rs/crate/syn/2.0.101/source/Cargo.toml.

@Mark-Simulacrum
Copy link
Member

We don't measure Cargo's execution, just rustc, so basically nothing at the Cargo level should get reflected (even if it's terrible :)

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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants