summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2021-03-26 16:10:21 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2021-04-04 14:57:05 -0400
commitb3a4f91b8d16f65e3220f14fc7867fed0cc7d1e7 (patch)
tree330656913d7ad3d4f900f383d2e13db3c639cf7e /src/bootstrap
parenta76de0d0a74ed6212475404bf9c6ce19ac337a6a (diff)
downloadrust-b3a4f91b8d16f65e3220f14fc7867fed0cc7d1e7.tar.gz
rust-b3a4f91b8d16f65e3220f14fc7867fed0cc7d1e7.zip
Bump cfgs
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 86f59495504..38901a35296 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -741,12 +741,7 @@ impl<'a> Builder<'a> {
             .env("RUSTDOC_REAL", self.rustdoc(compiler))
             .env("RUSTC_BOOTSTRAP", "1");
 
-        // cfg(bootstrap), can be removed on the next beta bump
-        if compiler.stage == 0 {
-            cmd.arg("-Winvalid_codeblock_attributes");
-        } else {
-            cmd.arg("-Wrustdoc::invalid_codeblock_attributes");
-        }
+        cmd.arg("-Wrustdoc::invalid_codeblock_attributes");
 
         if self.config.deny_warnings {
             cmd.arg("-Dwarnings");
@@ -1303,12 +1298,7 @@ impl<'a> Builder<'a> {
             // fixed via better support from Cargo.
             cargo.env("RUSTC_LINT_FLAGS", lint_flags.join(" "));
 
-            // cfg(bootstrap), can be removed on the next beta bump
-            if compiler.stage == 0 {
-                rustdocflags.arg("-Winvalid_codeblock_attributes");
-            } else {
-                rustdocflags.arg("-Wrustdoc::invalid_codeblock_attributes");
-            }
+            rustdocflags.arg("-Wrustdoc::invalid_codeblock_attributes");
         }
 
         if mode == Mode::Rustc {