test

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

src/bootstrap/src/core/build_steps/tool.rs

@@ -625,6 +625,9 @@ impl Step for Rustdoc {
         }
 
         let bin_rustdoc = || {
+            let mut compiler = self.compiler;
+            compiler.stage += 1;
+
             let sysroot = builder.sysroot(compiler);
             let bindir = sysroot.join("bin");
             t!(fs::create_dir_all(&bindir));
@@ -681,7 +684,7 @@ impl Step for Rustdoc {
         });
 
         // don't create a stage0-sysroot/bin directory.
-        if compiler.stage > 0 {
+        if compiler.stage > 0 || self.compiler.is_downgraded_already() {
             if builder.config.rust_debuginfo_level_tools == DebuginfoLevel::None {
                 // Due to LTO a lot of debug info from C++ dependencies such as jemalloc can make it into
                 // our final binaries

src/bootstrap/src/core/builder/cargo.rs

@@ -1,6 +1,6 @@
 use std::env;
 use std::ffi::{OsStr, OsString};
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use super::{Builder, Kind};
 use crate::core::build_steps::tool::SourceType;
@@ -456,7 +456,7 @@ impl Builder<'_> {
     /// commands to be run with Miri.
     fn cargo(
         &self,
-        compiler: Compiler,
+        mut compiler: Compiler,
         mode: Mode,
         source_type: SourceType,
         target: TargetSelection,
@@ -473,6 +473,7 @@ impl Builder<'_> {
             build_stamp::clear_if_dirty(self, &out_dir, &backend);
         }
 
+        let rustdoc_path = self.rustc(compiler).parent().unwrap().join("rustdoc");
         if cmd_kind == Kind::Doc {
             let my_out = match mode {
                 // This is the intended out directory for compiler documentation.
@@ -486,8 +487,7 @@ impl Builder<'_> {
                 }
                 _ => panic!("doc mode {mode:?} not expected"),
             };
-            let rustdoc = self.rustdoc(compiler);
-            build_stamp::clear_if_dirty(self, &my_out, &rustdoc);
+            build_stamp::clear_if_dirty(self, &my_out, &rustdoc_path);
         }
 
         let profile_var = |name: &str| cargo_profile_var(name, &self.config);
@@ -779,11 +779,6 @@ impl Builder<'_> {
             build_stamp::clear_if_dirty(self, &out_dir, &self.rustc(compiler));
         }
 
-        let rustdoc_path = match cmd_kind {
-            Kind::Doc | Kind::Test | Kind::MiriTest => self.rustdoc(compiler),
-            _ => PathBuf::from("/path/to/nowhere/rustdoc/not/required"),
-        };
-
         // Customize the compiler we're running. Specify the compiler to cargo
         // as our shim and then pass it some various options used to configure
         // how the actual compiler itself is called.