about summary refs log tree commit diff
diff options
context:
space:
mode:
authorviandoxdev <titouangoulois29@gmail.com>2022-11-01 22:18:19 +0100
committerviandoxdev <titouangoulois29@gmail.com>2022-11-01 22:18:19 +0100
commitffd4078264c4892b5098d6191e0adfe3564d62ca (patch)
treec434ffbe6c5a6621b590c26748cda0454982ad79
parent6e1361f358849b55f9112dd374282161dfb67e2e (diff)
downloadrust-ffd4078264c4892b5098d6191e0adfe3564d62ca.tar.gz
rust-ffd4078264c4892b5098d6191e0adfe3564d62ca.zip
fix json running all the time
-rw-r--r--src/bootstrap/doc.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 649c11be8e0..827a5346491 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -524,8 +524,13 @@ impl Step for JsonStd {
     const DEFAULT: bool = false;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        let default = run.builder.config.docs && run.builder.config.cmd.json();
-        run.all_krates("test").path("library").default_condition(default)
+        if run.builder.config.cmd.json() {
+            let default = run.builder.config.docs && run.builder.config.cmd.json();
+            run.all_krates("test").path("library").default_condition(default)
+        } else {
+            // Without this JsonStd would take priority on Std and prevent it from running.
+            run.never()
+        }
     }
 
     fn make_run(run: RunConfig<'_>) {