Rollup merge of #104156 - oli-obk:autoderef, r=estebank

[rust.git] / src / bootstrap / test.rs

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index e168dd571f6d2b336d3657201899d3303c0778bc..931d9a67944df704163193c9eb214f0bbdae1f55 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -16,6 +16,7 @@
 use crate::compile;
 use crate::config::TargetSelection;
 use crate::dist;
+use crate::doc::DocumentationFormat;
 use crate::flags::Subcommand;
 use crate::native;
 use crate::tool::{self, SourceType, Tool};
@@ -822,7 +823,11 @@ fn run(self, builder: &Builder<'_>) {
                     command.arg("--test-file").arg(path);
                 }
             }
-            builder.ensure(crate::doc::Std { target: self.target, stage: builder.top_stage });
+            builder.ensure(crate::doc::Std {
+                target: self.target,
+                stage: builder.top_stage,
+                format: DocumentationFormat::HTML,
+            });
             builder.run(&mut command);
         } else {
             builder.info("No nodejs found, skipping \"src/test/rustdoc-js-std\" tests");
@@ -1052,6 +1057,9 @@ fn run(self, builder: &Builder<'_>) {
         if builder.is_verbose() {
             cmd.arg("--verbose");
         }
+        if builder.config.cmd.bless() {
+            cmd.arg("--bless");
+        }
 
         builder.info("tidy check");
         try_run(builder, &mut cmd);