Auto merge of #159857 - weihanglo:update-cargo, r=ranger-ross

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)

Author: bors

src/tools/cargo

@@ -201,6 +201,14 @@ fn run_cargo_test(
     command.args(filters);
 
     let status = command
+        // `xsv` locates binaries relative to `current_exe()`
+        // which assumes Cargo legacy build-dir layout.
+        //
+        // See failure logs:
+        // https://triage.rust-lang.org/gha-logs/rust-lang/rust/90658568103
+        //
+        // FIXME(weihanglo): replace xsv to something else with similar portfolio.
+        .env("__CARGO_TEMPORARY_BUILD_DIR_NEW_LAYOUT_OPT_OUT", "1")
         // Disable rust-lang/cargo's cross-compile tests
         .env("CFG_DISABLE_CROSS_TESTS", "1")
         // Relax #![deny(warnings)] in some crates

src/tools/cargotest/main.rs

@@ -84,7 +84,8 @@ pub use crate::external_deps::rustdoc::{Rustdoc, bare_rustdoc, rustdoc};
 // Path-related helpers.
 pub use crate::path_helpers::{
     build_root, cwd, filename_contains, filename_not_in_denylist, has_extension, has_prefix,
-    has_suffix, not_contains, path, shallow_find_directories, shallow_find_files, source_root,
+    has_suffix, not_contains, path, recursive_find_files, shallow_find_directories,
+    shallow_find_files, source_root,
 };
 // Convenience helpers for running binaries and other commands.
 pub use crate::run::{cmd, run, run_fail, run_with_args};

src/tools/run-make-support/src/lib.rs

@@ -59,6 +59,30 @@ pub fn shallow_find_files<P: AsRef<Path>, F: Fn(&PathBuf) -> bool>(
     matching_files
 }
 
+/// Browse the directory `path` recursively and return all files which respect the parameters
+/// outlined by `closure`.
+#[track_caller]
+pub fn recursive_find_files<P: AsRef<Path>, F: Fn(&PathBuf) -> bool>(
+    path: P,
+    filter: F,
+) -> Vec<PathBuf> {
+    let mut matching_files = Vec::new();
+    let mut stack = vec![path.as_ref().to_path_buf()];
+    while let Some(dir) = stack.pop() {
+        for entry in rfs::read_dir(dir) {
+            let entry = entry.expect("failed to read directory entry.");
+            let path = entry.path();
+
+            if path.is_dir() {
+                stack.push(path);
+            } else if path.is_file() && filter(&path) {
+                matching_files.push(path);
+            }
+        }
+    }
+    matching_files
+}
+
 /// Browse the directory `path` non-recursively and return all directories which respect the
 /// parameters outlined by `closure`.
 #[track_caller]

src/tools/run-make-support/src/path_helpers.rs

@@ -19,8 +19,8 @@ use std::collections::HashSet;
 use run_make_support::object::read::Object;
 use run_make_support::object::read::archive::ArchiveFile;
 use run_make_support::object::{ObjectSection, ObjectSymbol, RelocationTarget};
-use run_make_support::rfs::{read, read_dir};
-use run_make_support::{cargo, object, path, target};
+use run_make_support::rfs::read;
+use run_make_support::{cargo, object, path, recursive_find_files, target};
 
 fn main() {
     let target_dir = path("target");
@@ -44,18 +44,14 @@ fn main() {
         .env("LIB", std::env::var("LIB").unwrap_or_default())
         .run();
 
-    let rlibs_path = target_dir.join(target()).join("debug").join("deps");
-    let compiler_builtins_rlib = read_dir(rlibs_path)
-        .find_map(|e| {
-            let path = e.unwrap().path();
-            let file_name = path.file_name().unwrap().to_str().unwrap();
-            if file_name.starts_with("libcompiler_builtins") && file_name.ends_with(".rlib") {
-                Some(path)
-            } else {
-                None
-            }
-        })
-        .unwrap();
+    // The rlib file is emitted as an intermediate build artifacts.
+    // Do not hardcode the path.
+    let mut rlibs = recursive_find_files(&target_dir.join(target()).join("debug"), |path| {
+        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:?}");
+    let compiler_builtins_rlib = rlibs.pop().unwrap();
 
     // rlib files are archives, where the archive members each a CGU, and we also have one called
     // lib.rmeta which is the encoded metadata. Each of the CGUs is an object file.

src/tools/rustc-perf

@@ -5,7 +5,7 @@
 
 #![deny(warnings)]
 
-use run_make_support::{cargo, llvm_filecheck, path, rfs, target};
+use run_make_support::{cargo, llvm_filecheck, path, recursive_find_files, target};
 
 fn main() {
     let target_dir = path("target");
@@ -29,18 +29,14 @@ fn main() {
         .env("LIB", std::env::var("LIB").unwrap_or_default())
         .run();
 
-    let out_dir = target_dir.join(target()).join("release").join("deps");
-    let ir_file = rfs::read_dir(out_dir)
-        .find_map(|e| {
-            let path = e.unwrap().path();
-            let file_name = path.file_name().unwrap().to_str().unwrap();
-            if file_name.starts_with("panic_scenarios") && file_name.ends_with(".ll") {
-                Some(path)
-            } else {
-                None
-            }
-        })
-        .unwrap();
+    // The .ll file is emitted as an intermediate build artifacts.
+    // Do not hardcode the path.
+    let mut ir_files = recursive_find_files(&target_dir.join(target()).join("release"), |path| {
+        let file_name = path.file_name().unwrap().to_str().unwrap();
+        file_name.starts_with("panic_scenarios") && file_name.ends_with(".ll")
+    });
+    assert_eq!(ir_files.len(), 1, "expected exactly one .ll file: {ir_files:?}");
+    let ir_file = ir_files.pop().unwrap();
 
     llvm_filecheck().patterns("lib.rs").input_file(ir_file).run();
 }