about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2024-03-12 09:04:03 -0700
committerGitHub <noreply@github.com>2024-03-12 09:04:03 -0700
commitcf3d178e2dc7608d21ed699455c44ad965cc1933 (patch)
treeec597f69dbd26db86b3e208d6c8a9808d56f4bd7
parentbca8c62776f1f27fd39768b27bb3e8dbfb89fd47 (diff)
parente8cef43dd8bebc4a318970a83f938931ad663d0c (diff)
downloadrust-cf3d178e2dc7608d21ed699455c44ad965cc1933.tar.gz
rust-cf3d178e2dc7608d21ed699455c44ad965cc1933.zip
Rollup merge of #122378 - clubby789:rustbook-rebuild, r=onur-ozkan
Properly rebuild rustbooks

Fixes #122367

If the book was out of date but the tool was up to date, this would evaluate to `!(false || true)` == `!true` == `false` and not rebuild.
-rw-r--r--src/bootstrap/src/core/build_steps/doc.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index c23cd9374a6..1d4d9d4c2e1 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -145,7 +145,8 @@ impl<P: Step> Step for RustbookSrc<P> {
         let rustbook = builder.tool_exe(Tool::Rustbook);
         let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
 
-        if !builder.config.dry_run() && !(up_to_date(&src, &index) || up_to_date(&rustbook, &index))
+        if !builder.config.dry_run()
+            && (!up_to_date(&src, &index) || !up_to_date(&rustbook, &index))
         {
             builder.info(&format!("Rustbook ({target}) - {name}"));
             let _ = fs::remove_dir_all(&out);