Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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", &[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 585 files
Loading