From 9a42c6c650cef2d22ed3aa7bda97b8f6005897f3 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Fri, 17 Jul 2026 20:38:53 -0400 Subject: [PATCH] Update cargo submodule Doc step changes because doc dir in cargo repo has moved --- src/bootstrap/src/core/build_steps/dist.rs | 2 +- src/bootstrap/src/core/build_steps/doc.rs | 2 +- src/bootstrap/src/core/builder/cli_paths/snapshots/x_doc.snap | 2 +- src/tools/cargo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index fdb13d3ca6a34..b74dd7dc3b987 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1445,7 +1445,7 @@ impl Step for Cargo { let cargo = builder.ensure(tool::Cargo::from_build_compiler(build_compiler, target)); let src = builder.src.join("src/tools/cargo"); - let etc = src.join("src/etc"); + let etc = src.join("etc"); // Prepare the image directory let mut tarball = Tarball::new(builder, "cargo", &target.triple); diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs index 847282ee62719..23ec6162351e0 100644 --- a/src/bootstrap/src/core/build_steps/doc.rs +++ b/src/bootstrap/src/core/build_steps/doc.rs @@ -70,7 +70,7 @@ macro_rules! book { // adding a build step in `src/bootstrap/code/builder/mod.rs`! // NOTE: Make sure to add the corresponding submodule when adding a new book. book!( - CargoBook, "src/tools/cargo/src/doc", "cargo", &[]; + CargoBook, "src/tools/cargo/doc/book", "cargo", &[]; ClippyBook, "src/tools/clippy/book", "clippy", &[]; EditionGuide, "src/doc/edition-guide", "edition-guide", &[]; EmbeddedBook, "src/doc/embedded-book", "embedded-book", &[]; diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_doc.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_doc.snap index 610a71ab70cf3..bbf3a80b276ad 100644 --- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_doc.snap +++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_doc.snap @@ -50,7 +50,7 @@ expression: doc - Set({doc::src/doc/rustc}) [Doc] doc::CargoBook targets: [aarch64-unknown-linux-gnu] - - Set({doc::src/tools/cargo/src/doc}) + - Set({doc::src/tools/cargo/doc/book}) [Doc] doc::ClippyBook targets: [aarch64-unknown-linux-gnu] - Set({doc::src/tools/clippy/book}) diff --git a/src/tools/cargo b/src/tools/cargo index 59800466c5c41..3efb1f477e99b 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 59800466c5c41c444d264b1010b4d57e85a7117f +Subproject commit 3efb1f477e99b42974b982d939fd100303cdf7db