Update cargo submodule

[weihanglo]

4 commits in 2f0e7011e0e9cb30cb772bf2ec1d69dce4dff4f3..59800466c5c41c444d264b1010b4d57e85a7117f
2026-07-05 12:10:34 +0000 to 2026-07-07 15:52:22 +0000

• Revert "feat: Stablize build-dir layout v2" (Revert "feat: Stablize build-dir layout v2" cargo#17187)
• Use a set when checking visited workspace members (Use a set when checking visited workspace members cargo#17180)
• Stabilize build-dir layout v2 (Stabilize build-dir layout v2  cargo#16807)
• Change HashMaps and HashSets in Cargo to use Fxhasher (Change HashMaps and HashSets in Cargo to use Fxhasher cargo#17169)

[rustbot]

Some changes occurred in src/tools/cargo

cc @ehuss

[rustbot]

⚠️ Warning ⚠️

• Some commits in this PR modify submodules.

  If this was not intentional, see I changed a submodule on accident in the rustc dev guide.

[Kobzol]

This will probably see a large regression on the large-workspace benchmark, which should be mitigated by #158823.

@bors try @rust-timer queue

[rust-bors]

☀️ Try build successful (CI)
Build commit: c1a85b6 (c1a85b60361f366d64c81d59df0ab606370284dd)
Base parent: 3c00c96 (3c00c96d3af4d5b5e101e56cc161a608b21366ee)

[rust-timer]

Finished benchmarking commit (c1a85b6): comparison URL.

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

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

Next, please: If you can, justify the regressions found in this try perf run in writing along with @rustbot label: +perf-regression-triaged. If not, fix the regressions and do another perf run. Neutral or positive results will clear the label automatically.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +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.4%	[0.1%, 0.9%]	18
Regressions ❌ (secondary)	43.1%	[0.3%, 134.7%]	18
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[-0.2%, 0.9%]	22

Max RSS (memory usage)

Results (primary -0.6%, secondary -2.6%)

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)	4.0%	[1.1%, 9.0%]	4
Improvements ✅ (primary)	-0.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-7.8%	[-12.2%, -2.9%]	5
All ❌✅ (primary)	-0.6%	[-0.6%, -0.6%]	1

Cycles

Results (primary -1.6%, secondary 32.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)	32.0%	[3.6%, 79.2%]	14
Improvements ✅ (primary)	-1.6%	[-1.6%, -1.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.6%	[-1.6%, -1.6%]	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.0%	[0.0%, 0.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Bootstrap: 491.018s -> 488.968s (-0.42%)
Artifact size: 388.45 MiB -> 388.36 MiB (-0.02%)

[rustbot]

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]

@bors r+ rollup=never p=1

[rust-bors]

📌 Commit 44d4dd5 has been approved by weihanglo

It is now in the queue for this repository.

[JonathanBrouwer]

@bors p=6
Scheduling this before the rollup, so the rollup has time to run try jobs

[rust-bors]

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

[github-actions]

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 c290daa (parent) -> 7ef36ed (this PR)

Test differences

Show 117 test diffs

Stage 2

• build_dir::build_script_should_output_to_build_dir: pass -> [missing] (J0)
• build_dir::new_layout_opt_out_nightly: [missing] -> pass (J0)
• build_dir::new_layout_opt_out_stable: [missing] -> pass (J0)
• build_dir_fine_grain_locking::artifact_deps: [missing] -> pass (J0)
• build_dir_fine_grain_locking::benches_should_output_to_build_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::binary_with_debug: [missing] -> pass (J0)
• build_dir_fine_grain_locking::binary_with_release: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_clean_should_clean_the_target_dir_and_build_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_clean_should_remove_correct_files: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_doc_should_output_to_target_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_package_should_build_in_build_dir_and_output_to_target_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_publish_should_only_touch_build_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::cargo_rustdoc_json_should_output_to_target_dir: [missing] -> ignore (--output-format is unstable) (J0)
• build_dir_fine_grain_locking::cargo_tmpdir_should_output_to_build_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::examples_should_output_to_build_dir_and_uplift_to_target_dir: [missing] -> pass (J0)
• build_dir_fine_grain_locking::future_incompat_should_output_to_build_dir: [missing] -> ignore (-Zfuture-incompat-test requires nightly (permanently)) (J0)
• build_dir_fine_grain_locking::libs: [missing] -> pass (J0)
• build_dir_fine_grain_locking::new_layout_opt_out: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_cargo_cache_home: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_should_error_for_invalid_variables: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_should_handle_reject_unmatched_brackets: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_should_suggest_nearest_variable: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_workspace_path_hash: [missing] -> pass (J0)
• build_dir_fine_grain_locking::template_workspace_path_hash_should_handle_symlink: [missing] -> pass (J0)
• build_dir_fine_grain_locking::timings_report_should_output_to_target_dir: [missing] -> pass (J0)
• clean::clean_p_respects_build_target_config: pass -> [missing] (J0)
• clean::clean_workspace_does_not_touch_non_workspace_packages: pass -> [missing] (J0)
• clean::clean_workspace_with_extra_package_specifiers: pass -> [missing] (J0)
• clean::env_target_dir_is_file: pass -> [missing] (J0)
• clean::explicit_target_dir_is_file: pass -> [missing] (J0)
• clean::target_dir_is_file: pass -> [missing] (J0)
• clean::target_dir_is_symlink_dir: pass -> [missing] (J0)
• clean_legacy_layout::build_script: [missing] -> pass (J0)
• clean_legacy_layout::cargo_clean_simple: [missing] -> pass (J0)
• clean_legacy_layout::clean_doc: [missing] -> pass (J0)
• clean_legacy_layout::clean_dry_run: [missing] -> pass (J0)
• clean_legacy_layout::clean_git: [missing] -> pass (J0)
• clean_legacy_layout::clean_multiple_packages: [missing] -> pass (J0)
• clean_legacy_layout::clean_multiple_packages_in_glob_char_path: [missing] -> pass (J0)
• clean_legacy_layout::clean_p_only_cleans_specified_package: [missing] -> pass (J0)
• clean_legacy_layout::clean_p_respects_build_target_config: [missing] -> pass (J0)
• clean_legacy_layout::clean_release: [missing] -> pass (J0)
• clean_legacy_layout::clean_remove_rlib_rmeta: [missing] -> pass (J0)
• clean_legacy_layout::clean_spec_partial_version: [missing] -> pass (J0)
• clean_legacy_layout::clean_spec_partial_version_ambiguous: [missing] -> pass (J0)
• clean_legacy_layout::clean_spec_reserved: [missing] -> pass (J0)
• clean_legacy_layout::clean_spec_version: [missing] -> pass (J0)
• clean_legacy_layout::clean_verbose: [missing] -> pass (J0)
• clean_legacy_layout::clean_workspace_with_extra_package_specifiers: [missing] -> pass (J0)
• clean_legacy_layout::config_target_dir_is_file: [missing] -> pass (J0)
• clean_legacy_layout::config_target_dir_tag_invalid_signature: [missing] -> pass (J0)
• clean_legacy_layout::config_target_dir_tag_not_present: [missing] -> pass (J0)
• clean_legacy_layout::config_target_dir_tag_symlink: [missing] -> pass (J0)
• clean_legacy_layout::different_dir: [missing] -> pass (J0)
• clean_legacy_layout::doc_with_package_selection: [missing] -> pass (J0)
• clean_legacy_layout::env_target_dir_tag_invalid_signature: [missing] -> pass (J0)
• clean_legacy_layout::env_target_dir_tag_not_present: [missing] -> pass (J0)
• clean_legacy_layout::env_target_dir_tag_symlink: [missing] -> pass (J0)
• clean_legacy_layout::env_target_dir_tag_valid: [missing] -> pass (J0)
• clean_legacy_layout::explicit_target_dir_is_file: [missing] -> pass (J0)
• clean_legacy_layout::explicit_target_dir_tag_invalid_signature: [missing] -> pass (J0)
• clean_legacy_layout::explicit_target_dir_tag_not_present: [missing] -> pass (J0)
• clean_legacy_layout::explicit_target_dir_tag_symlink: [missing] -> pass (J0)
• clean_legacy_layout::explicit_target_dir_tag_valid: [missing] -> pass (J0)
• clean_legacy_layout::package_cleans_all_the_things: [missing] -> pass (J0)
• clean_legacy_layout::quiet_does_not_show_summary: [missing] -> pass (J0)
• clean_legacy_layout::target_dir_is_file: [missing] -> pass (J0)
• clean_legacy_layout::target_dir_is_symlink_dir: [missing] -> pass (J0)
• clean_legacy_layout::target_dir_is_symlink_file: [missing] -> pass (J0)
• clean_new_layout::build_script: pass -> [missing] (J0)
• clean_new_layout::cargo_clean_simple: pass -> [missing] (J0)
• clean_new_layout::clean_doc: pass -> [missing] (J0)
• clean_new_layout::clean_dry_run: pass -> [missing] (J0)
• clean_new_layout::clean_git: pass -> [missing] (J0)
• clean_new_layout::clean_multiple_packages: pass -> [missing] (J0)
• clean_new_layout::clean_multiple_packages_in_glob_char_path: pass -> [missing] (J0)
• clean_new_layout::clean_p_only_cleans_specified_package: pass -> [missing] (J0)
• clean_new_layout::clean_release: pass -> [missing] (J0)
• clean_new_layout::clean_remove_rlib_rmeta: pass -> [missing] (J0)
• clean_new_layout::clean_spec_partial_version: pass -> [missing] (J0)
• clean_new_layout::clean_spec_reserved: pass -> [missing] (J0)
• clean_new_layout::clean_verbose: pass -> [missing] (J0)
• clean_new_layout::config_target_dir_tag_invalid_signature: pass -> [missing] (J0)
• clean_new_layout::config_target_dir_tag_not_present: pass -> [missing] (J0)
• clean_new_layout::config_target_dir_tag_symlink: pass -> [missing] (J0)
• clean_new_layout::config_target_dir_tag_valid: pass -> [missing] (J0)
• clean_new_layout::different_dir: pass -> [missing] (J0)
• clean_new_layout::doc_with_package_selection: pass -> [missing] (J0)
• clean_new_layout::env_target_dir_tag_invalid_signature: pass -> [missing] (J0)
• clean_new_layout::env_target_dir_tag_not_present: pass -> [missing] (J0)
• clean_new_layout::env_target_dir_tag_symlink: pass -> [missing] (J0)
• clean_new_layout::env_target_dir_tag_valid: pass -> [missing] (J0)
• clean_new_layout::explicit_target_dir_not_exists: pass -> [missing] (J0)
• clean_new_layout::explicit_target_dir_tag_invalid_signature: pass -> [missing] (J0)
• clean_new_layout::explicit_target_dir_tag_not_present: pass -> [missing] (J0)
• clean_new_layout::explicit_target_dir_tag_symlink: pass -> [missing] (J0)
• clean_new_layout::explicit_target_dir_tag_valid: pass -> [missing] (J0)
• clean_new_layout::package_cleans_all_the_things: pass -> [missing] (J0)
• clean_new_layout::quiet_does_not_show_summary: pass -> [missing] (J0)
• clean_new_layout::registry: pass -> [missing] (J0)

(and 13 additional test diffs)

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

Job group index

• J0: aarch64-apple, aarch64-apple-macos-26, aarch64-gnu, x86_64-gnu-aux, x86_64-msvc-ext1

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 7ef36edc23ac10760eb9f097d32edbab2e1e8928 --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-x86_64-apple: 1h 46m -> 2h 42m (+53.0%)
2. x86_64-gnu-gcc-core-tests: 13m 59s -> 8m 10s (-41.6%)
3. x86_64-msvc-1: 2h 38m -> 1h 37m (-38.5%)
4. dist-armhf-linux: 1h 1m -> 1h 25m (+38.5%)
5. dist-x86_64-llvm-mingw: 1h 28m -> 1h 53m (+28.3%)
6. x86_64-gnu-debug: 2h -> 1h 29m (-25.8%)
7. i686-msvc-1: 3h 2m -> 2h 20m (-23.2%)
8. dist-aarch64-apple: 1h 33m -> 1h 54m (+22.7%)
9. dist-x86_64-solaris: 1h 34m -> 1h 15m (-19.9%)
10. i686-gnu-nopt-1: 2h 30m -> 2h 4m (-17.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]

Finished benchmarking commit (7ef36ed): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary 6.8%)

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

Cycles

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

Binary size

Results (primary 0.0%, 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.0%	[0.0%, 0.0%]	23
Regressions ❌ (secondary)	0.0%	[0.0%, 0.1%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.0%]	23

Bootstrap: 488.694s -> 492.064s (0.69%)
Artifact size: 389.00 MiB -> 388.80 MiB (-0.05%)