about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-03-28 07:01:10 +0200
committerGitHub <noreply@github.com>2023-03-28 07:01:10 +0200
commit1af75b1e96030cb33025075a1d64205cd26939f5 (patch)
tree58e229c17dfdcc56c5ae2ebac9057385845535a5
parenta608e501ec1db8990392150fd0961ac0e4790862 (diff)
parent9fc7eca935a00f06c3e47b29a4bb8e313eb47e7a (diff)
downloadrust-1af75b1e96030cb33025075a1d64205cd26939f5.tar.gz
rust-1af75b1e96030cb33025075a1d64205cd26939f5.zip
Rollup merge of #109667 - clubby789:fix-stage0-doc, r=ozkanonur
Always set `RUSTC_BOOTSTRAP` with `x doc`

Fixes #100060

Note that there is still a warning - the `unused_allocation` lint does not fire in stage 0, but that's just a matter of waiting for #104363 to land in beta
-rw-r--r--src/bootstrap/doc.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 36fdd4abf4f..be43affa404 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -1027,10 +1027,11 @@ impl Step for RustcBook {
         if self.validate {
             cmd.arg("--validate");
         }
-        if !builder.unstable_features() {
-            // We need to validate nightly features, even on the stable channel.
-            cmd.env("RUSTC_BOOTSTRAP", "1");
-        }
+        // We need to validate nightly features, even on the stable channel.
+        // Set this unconditionally as the stage0 compiler may be being used to
+        // document.
+        cmd.env("RUSTC_BOOTSTRAP", "1");
+
         // If the lib directories are in an unusual location (changed in
         // config.toml), then this needs to explicitly update the dylib search
         // path.