Unrolled build for rust-lang#123055

Rollup merge of rust-lang#123055 - onur-ozkan:miri-rustdoc, r=RalfJung

enable cargo miri test doctests

This was the cleanest solution that came to my mind so far.

cc `@RalfJung`

Resolves rust-lang#123028

src/bootstrap/src/core/build_steps/test.rs

@@ -680,9 +680,13 @@ impl Step for Miri {
  .arg("--manifest-path")
  .arg(builder.src.join("src/tools/miri/test-cargo-miri/Cargo.toml"));
  cargo.arg("--target").arg(target.rustc_target_arg());
- cargo.arg("--tests"); // don't run doctests, they are too confused by the staging
  cargo.arg("--").args(builder.config.test_args());
 
+ // `prepare_tool_cargo` sets RUSTDOC to the bootstrap wrapper and RUSTDOC_REAL to a dummy path as this is a "run", not a "test".
+ // Also, we want the rustdoc from the "next" stage for the same reason that we build a std from the next stage.
+ // So let's just set that here, and bypass bootstrap's RUSTDOC (just like cargo-miri already ignores bootstrap's RUSTC_WRAPPER).
+ cargo.env("RUSTDOC", builder.rustdoc(compiler_std));
+
  // Tell `cargo miri` where to find things.
  cargo.env("MIRI_SYSROOT", &miri_sysroot);
  cargo.env("MIRI_HOST_SYSROOT", sysroot);

src/tools/miri/README.md

@@ -505,6 +505,8 @@ binaries, and as such worth documenting:
 * `MIRI_LOCAL_CRATES` is set by `cargo-miri` to tell the Miri driver which
  crates should be given special treatment in diagnostics, in addition to the
  crate currently being compiled.
+* `MIRI_ORIG_RUSTDOC` is set and read by different phases of `cargo-miri` to remember the
+ value of `RUSTDOC` from before it was overwritten.
 * `MIRI_VERBOSE` when set to any value tells the various `cargo-miri` phases to
  perform verbose logging.
 * `MIRI_HOST_SYSROOT` is set by bootstrap to tell `cargo-miri` which sysroot to use for *host*

src/tools/miri/cargo-miri/src/phases.rs

@@ -202,6 +202,9 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
  cmd.env("MIRI_BE_RUSTC", "target"); // we better remember to *unset* this in the other phases!
 
  // Set rustdoc to us as well, so we can run doctests.
+ if let Some(orig_rustdoc) = env::var_os("RUSTDOC") {
+ cmd.env("MIRI_ORIG_RUSTDOC", orig_rustdoc);
+ }
  cmd.env("RUSTDOC", &cargo_miri_path);
 
  cmd.env("MIRI_LOCAL_CRATES", local_crates(&metadata));
@@ -581,9 +584,10 @@ pub fn phase_rustdoc(mut args: impl Iterator<Item = String>) {
  let verbose = std::env::var("MIRI_VERBOSE")
  .map_or(0, |verbose| verbose.parse().expect("verbosity flag must be an integer"));
 
- // phase_cargo_miri sets the RUSTDOC env var to ourselves, so we can't use that here;
- // just default to a straight-forward invocation for now:
- let mut cmd = Command::new("rustdoc");
+ // phase_cargo_miri sets the RUSTDOC env var to ourselves, and puts a backup
+ // of the old value into MIRI_ORIG_RUSTDOC. So that's what we have to invoke now.
+ let rustdoc = env::var("MIRI_ORIG_RUSTDOC").unwrap_or("rustdoc".to_string());
+ let mut cmd = Command::new(rustdoc);
 
  let extern_flag = "--extern";
  let runtool_flag = "--runtool";