Rollup merge of #125856 - onur-ozkan:bootstrap-submodule-hotfix, r=onur-ozkan

matthiaskrgr · web-flow · commit 77ca71f61532 · 2024-06-01T17:03:50.000+02:00
include missing submodule on bootstrap As of #125408 PR, rustbook now relies on dependencies from the "src/doc/book" submodule. However, bootstrap does not automatically sync this submodule before reading metadata informations. And if the submodule is not present, reading metadata will fail because rustbook's dependencies will be missing. This change makes "src/doc/book" to be fetched/synced automatically before trying to read metadata. cc `@Zalathar`
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
@@ -469,7 +469,8 @@ impl Build {
 
             // Make sure we update these before gathering metadata so we don't get an error about missing
             // Cargo.toml files.
-            let rust_submodules = ["src/tools/cargo", "library/backtrace", "library/stdarch"];
+            let rust_submodules =
+                ["src/tools/cargo", "src/doc/book", "library/backtrace", "library/stdarch"];
             for s in rust_submodules {
                 build.update_submodule(Path::new(s));
             }

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,8 @@ impl Build {`
`469`	`469`
`470`	`470`	`// Make sure we update these before gathering metadata so we don't get an error about missing`
`471`	`471`	`// Cargo.toml files.`
`472`		`- let rust_submodules = ["src/tools/cargo", "library/backtrace", "library/stdarch"];`
	`472`	`+ let rust_submodules =`
	`473`	`+ ["src/tools/cargo", "src/doc/book", "library/backtrace", "library/stdarch"];`
`473`	`474`	`for s in rust_submodules {`
`474`	`475`	`build.update_submodule(Path::new(s));`
`475`	`476`	`}`