Apply review comments

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 6157d3d4ac695a32935db46086288ce44b0f12d7..a9bdca5ad77412caa28e354bbd809dd4f2eb03e8 100644 (file)
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -726,8 +726,10 @@ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
             .env("RUSTDOC_REAL", self.rustdoc(compiler))
             .env("RUSTDOC_CRATE_VERSION", self.rust_version())
             .env("RUSTC_BOOTSTRAP", "1")
-            .arg("--deny")
-            .arg("invalid_codeblock_attribute");
+            .arg("-Dinvalid_codeblock_attribute");
+        if self.config.deny_warnings {
+            cmd.arg("-Dwarnings");
+        }
 
         // Remove make-related flags that can cause jobserver problems.
         cmd.env_remove("MAKEFLAGS");
@@ -841,7 +843,6 @@ pub fn cargo(
         // but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See
         // #71458.
         let mut rustdocflags = rustflags.clone();
-        rustdocflags.arg("--deny").arg("invalid_codeblock_attribute");
 
         if let Ok(s) = env::var("CARGOFLAGS") {
             cargo.args(s.split_whitespace());
@@ -1160,6 +1161,8 @@ pub fn cargo(
             // are always ignored in dependencies. Eventually this should be
             // fixed via better support from Cargo.
             cargo.env("RUSTC_LINT_FLAGS", lint_flags.join(" "));
+
+            rustdocflags.arg("-Dinvalid_codeblock_attribute");
         }
 
         if let Mode::Rustc | Mode::Codegen = mode {