Skip to content

Update cargo submodule - #159857

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
weihanglo:update-cargo
Jul 30, 2026
Merged

Update cargo submodule#159857
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
weihanglo:update-cargo

Conversation

@weihanglo

@weihanglo weihanglo commented Jul 24, 2026

Copy link
Copy Markdown
Member

View all comments

src/tools/cargo

23 commits in 3efb1f477e99b42974b982d939fd100303cdf7db..7c83d4cc0953b81d823e47d640c64da9b8bd4fac
2026-07-17 23:53:19 +0000 to 2026-07-29 21:34:53 +0000

src/tools/rustc-perf

12 commits in 0508bdcd37152b28c39b6752828683cdd3f128b5..74ecbcdf88411937a6e39baf2779948565dfd388
2026-07-15 10:20:27 +0000 to 2026-07-27 15:02:48 +0000

@weihanglo weihanglo self-assigned this Jul 24, 2026
@rustbot

rustbot commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

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 Jul 24, 2026
@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@weihanglo

Copy link
Copy Markdown
Member Author

Need to update those rmake tests to reflect nightly build-dir layout changes.

@rustbot

rustbot commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

The run-make-support library was changed

cc @jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 24, 2026
@rustbot

This comment has been minimized.

@rustbot

This comment has been minimized.

@weihanglo

weihanglo commented Jul 24, 2026

Copy link
Copy Markdown
Member Author

r? ranger-ross

Mind reviewing 86a4c65 is good?

@rustbot

rustbot commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

let file_name = path.file_name().unwrap().to_str().unwrap();
file_name.starts_with("libcompiler_builtins") && file_name.ends_with(".rlib")
});
assert_eq!(rlibs.len(), 1, "expected exactly one compiler_builtins rlib: {rlibs:?}");

@weihanglo weihanglo Jul 25, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length assertion should guard us well to only get the one and only artifact.

View changes since the review

@weihanglo

Copy link
Copy Markdown
Member Author

Or @jieyouxu if you are willing to take a look at the rmake change? 🥺

@ranger-ross ranger-ross left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.unwrap();
// The rlib file is emitted as an intermediate build artifacts.
// Do not hardcode the path.
let mut rlibs = recursive_find_files(&target_dir, |path| {

@ranger-ross ranger-ross Jul 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we change this to target_dir.join("debug")?
If it's built in release mode we could end up finding the debug and release .rlibs and hit the assert below.
Not sure if that is applicable for run-make tests

View changes since the review

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Updated.

@jieyouxu jieyouxu self-assigned this Jul 25, 2026
@weihanglo

Copy link
Copy Markdown
Member Author

Okay. Going to merge this.

@bors r=ranger-ross p=1 rollup=never

If the remake test changes are bad, please call them out!

@rust-bors

rust-bors Bot commented Jul 25, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3e3b43c has been approved by ranger-ross

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 Jul 25, 2026
@jieyouxu

Copy link
Copy Markdown
Member

If the remake test changes are bad, please call them out!

No they look fine, cheers

rust-bors Bot pushed a commit that referenced this pull request Jul 29, 2026
Update cargo submodule


try-job: x86_64-gnu-aux
@rust-bors

rust-bors Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 07a4d70 (07a4d700cbc151b04637e48e0162f56792ce7217)
Base parent: b5be620 (b5be620d5ac9824c4a6030df9fb72644ef4f459b)

Cargo enables build-dir layout v2 by default on nightly
(rust-lang/cargo PR 17258).
Intermediate build artifacts no longer live in
`<target-dir>/<triple>/<profile>/deps/`
but in per-unit `build/<pkg>/<hash>/out/` directories.
`xsv` locates binaries relative to `current_exe()`, which assumes Cargo's
legacy build-dir layout:
https://triage.rust-lang.org/gha-logs/rust-lang/rust/90658568103

We should revisit and replace xsv to something else with similar portfolio
@rustbot

rustbot commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@weihanglo

Copy link
Copy Markdown
Member Author

@bors r=ranger-ross

@rust-bors

rust-bors Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 84600e0 has been approved by ranger-ross

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 Jul 29, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jul 29, 2026
Update cargo submodule




## src/tools/cargo

23 commits in 3efb1f477e99b42974b982d939fd100303cdf7db..7c83d4cc0953b81d823e47d640c64da9b8bd4fac
2026-07-17 23:53:19 +0000 to 2026-07-29 21:34:53 +0000
- fix: Pass rustdoc flags to final CCI merge step (rust-lang/cargo#17269)
- Reworked how we enable the new build-dir layout on nightly (rust-lang/cargo#17272)
- Allow setting `-Zembed-metadata` value from the config (rust-lang/cargo#17266)
- fix(cli): don't panic during completions when rustup is unavailable (rust-lang/cargo#17263)
- docs(workspace): add recommended structure to members field (rust-lang/cargo#17166)
- Update cargo-fetch.md to remove cargo-prefetch reference (rust-lang/cargo#16568)
- chore: bump to `libgit2-sys@0.18.7+1.9.6` (rust-lang/cargo#17259)
- Enable build-dir layout v2 on nightly by default (rust-lang/cargo#17258)
- fix(path): clarify error message when path dependency has wrong package (rust-lang/cargo#16927)
- fix(toml): warn on hyphenated lint names and duplicates (rust-lang/cargo#17051)
- fix(test): gate trim-paths tests on split debuginfo support (rust-lang/cargo#17256)
- test(git): Explicitly test for git injection attacks (rust-lang/cargo#17253)
- fix(git): Suggest libgit2 if git-cli fails (rust-lang/cargo#17252)
- fix(diag): bound transitive unused dependency traversal (rust-lang/cargo#17251)
- fix(git): Hide git fetch output without progress  (rust-lang/cargo#17243)
- revert(lint): Remove `new_implicit_minimum_version_req` (rust-lang/cargo#16321) (rust-lang/cargo#17249)
- fix: Add haiku's dylib path (rust-lang/cargo#17248)
- Zsh completion: Add `-p` and `--package` flags for `cargo add` (rust-lang/cargo#17247)
- refactor(source): Clarify the name of the remote git registry (rust-lang/cargo#17240)
- fix(timings): only report units the job queue actually ran (rust-lang/cargo#17238)
- Do not include proc-macro deps in rustc search path args (rust-lang/cargo#17236)
- chore(deps): update cargo-semver-checks to v0.49.0 (rust-lang/cargo#17237)
- rustdoc: rename the doc parts metadata params (rust-lang/cargo#17234)

## src/tools/rustc-perf

12 commits in 0508bdcd37152b28c39b6752828683cdd3f128b5..74ecbcdf88411937a6e39baf2779948565dfd388
2026-07-15 10:20:27 +0000 to 2026-07-27 15:02:48 +0000
- feat: support `@argfile` for rustc-fake (rust-lang/rustc-perf#2509)
- Download Clippy when a Clippy profile is requested (rust-lang/rustc-perf#2508)
- Add early check for missing rustdoc/clippy in a toolchain (rust-lang/rustc-perf#2507)
- Add 2026-07-21 triage (rust-lang/rustc-perf#2506)
- use stable extract_if: since 1.87 (rust-lang/rustc-perf#2191)
- Update GitHub Actions (rust-lang/rustc-perf#2460)
- Update dependency @types/msgpack-lite to v0.1.12 (rust-lang/rustc-perf#2439)
- Add 30 day history link to artifact size tab on the compare page (rust-lang/rustc-perf#2505)
- Fix selecting color for the bootstrap chart on the toolchain page (rust-lang/rustc-perf#2504)
- Add artifact size history chart to toolchain page (rust-lang/rustc-perf#2501)
- Parallel frontend compiler support (perf backend only) (rust-lang/rustc-perf#2491)
- Run benchmark smoke test for all profiles on Windows on CI (rust-lang/rustc-perf#2503)
@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 Jul 30, 2026
@rust-bors

rust-bors Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

💔 Test for fbad33a failed: CI. Failed job:

@weihanglo

Copy link
Copy Markdown
Member Author

https://triage.rust-lang.org/gha-logs/rust-lang/rust/90741182399#L2026-07-30T00:01:07.3175372Z

Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": context deadline exceeded (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.

Unrelated failure.

@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 Jul 30, 2026
@rust-log-analyzer

This comment was marked as outdated.

@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 Jul 30, 2026
@rust-bors

rust-bors Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: ranger-ross
Duration: 3h 17m 38s
Pushing 83709ee to main...

@rust-bors
rust-bors Bot merged commit 83709ee into rust-lang:main Jul 30, 2026
14 checks passed
@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 1a833e1 (parent) -> 83709ee (this PR)

Test differences

Show 47 test diffs

Stage 2

  • build::should_not_include_proc_macro_deps_paths_in_rustc_args: [missing] -> ignore (Depends on 61f3e08) (J0)
  • cargo_report_timings::all_fresh_session: [missing] -> pass (J0)
  • cargo_report_timings::idle_session: [missing] -> pass (J0)
  • config::unstable_embed_metadata: [missing] -> pass (J0)
  • doc::mergeable_info_with_rustdocflags: [missing] -> ignore (rustdoc mergeable crate info is unstable) (J0)
  • git::git_cli_arg_injection_via_branch: [missing] -> pass (J0)
  • git::git_cli_arg_injection_via_dep: [missing] -> pass (J0)
  • git::git_cli_arg_injection_via_rev: [missing] -> pass (J0)
  • git::git_fetch_cli_error_suggests_libgit2: [missing] -> pass (J0)
  • lints::implicit_minimum_version_req::build_dep: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::deny: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::detailed_dep_major_only: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::dev_dep: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::exact_requirement_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::fully_specified_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::git_dep_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::git_dep_with_registry_version: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::greater_eq: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::greater_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::less_eq_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::less_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::major_minor: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::major_only: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::multiple_implicit_deps: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::multiple_requirements: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::path_dep_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::path_dep_with_registry_version: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::target_dep: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::target_dev_dep: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::tilde_requirement_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::unused_workspace_dep: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::unused_workspace_dep_and_package_implicit_req: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::wildcard_minor_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::wildcard_should_not_warn: pass -> [missing] (J0)
  • lints::implicit_minimum_version_req::workspace_inherited: pass -> [missing] (J0)
  • lints_table::duplicate_lint_name_hyphen_and_underscore: [missing] -> pass (J0)
  • lints_table::hyphen_in_lint_name: [missing] -> pass (J0)
  • path::path_dep_other_packages_nearby: [missing] -> pass (J0)
  • path::path_dep_package_in_subdirectory: [missing] -> pass (J0)
  • path::path_dep_wrong_package_name: [missing] -> pass (J0)
  • timings::doc_test_units_not_reported: [missing] -> pass (J0)
  • timings::fresh_units_not_reported: [missing] -> pass (J0)
  • timings::report_generated_without_any_units: [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 83709eedfff36840b0749ca429ac43f5479b268f --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. x86_64-gnu-gcc-core-tests: 8m 1s -> 14m 8s (+76.2%)
  2. x86_64-msvc-2: 1h 38m -> 2h 18m (+40.8%)
  3. dist-x86_64-llvm-mingw: 1h 36m -> 2h 10m (+36.3%)
  4. x86_64-msvc-ext3: 1h 55m -> 1h 14m (-35.4%)
  5. x86_64-gnu: 1h 43m -> 2h 15m (+31.0%)
  6. dist-loongarch64-musl: 1h 24m -> 1h 48m (+28.8%)
  7. x86_64-msvc-ext2: 2h 2m -> 1h 27m (-28.6%)
  8. dist-various-1: 44m 30s -> 33m 37s (-24.5%)
  9. pr-check-1: 28m 2s -> 34m 51s (+24.3%)
  10. dist-i586-gnu-i586-i686-musl: 24m 59s -> 19m 37s (-21.4%)
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 (83709ee): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

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)
0.4% [0.2%, 0.6%] 15
Regressions ❌
(secondary)
37.3% [0.2%, 104.0%] 18
Improvements ✅
(primary)
-0.2% [-0.3%, -0.2%] 3
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) 0.3% [-0.3%, 0.6%] 18

Max RSS (memory usage)

Results (primary 1.1%, secondary 0.7%)

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

mean range count
Regressions ❌
(primary)
1.1% [0.4%, 3.2%] 6
Regressions ❌
(secondary)
0.7% [0.4%, 1.1%] 18
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.1% [0.4%, 3.2%] 6

Cycles

Results (primary 0.6%, secondary 9.0%)

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

mean range count
Regressions ❌
(primary)
1.1% [0.4%, 2.7%] 7
Regressions ❌
(secondary)
17.7% [0.5%, 56.6%] 21
Improvements ✅
(primary)
-0.6% [-0.7%, -0.5%] 3
Improvements ✅
(secondary)
-7.5% [-14.6%, -0.4%] 11
All ❌✅ (primary) 0.6% [-0.7%, 2.7%] 10

Binary size

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

Bootstrap: 497.309s -> 491.471s (-1.17%)
Artifact size: 390.20 MiB -> 390.58 MiB (0.10%)

@Kobzol

Kobzol commented Jul 30, 2026

Copy link
Copy Markdown
Member

The big regression on large-workspace was expected, and comes from Cargo passing in many more -L flags to rustc, which is not optimized for something like this at the moment. In absolute wall-time numbers, it was a regression of a few milliseconds on a crate with a thousand transitive dependencies, so it shouldn't be such a big deal in practice.

#158823 should improve the performance here considerably.

@rustbot label: +perf-regression-triaged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants