user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

doctests: fix merging on stable

Browse source 
Fixes #137898

The generated multi-test harness relies on nightly-only APIs,
so the only way to run it on stable is to enable them. Since
tests that use crate attrs don't be merged, there's no way to use
nightly-only features on it anyway.

(cherry picked from commit 5d6eeea5f9)
This commit is contained in:
Michael Howell 2025-03-02 14:33:29 -07:00 • committed by Josh Stone
parent 3aa36cf951
commit b30cc1ef49
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustdoc/doctest.rs
View file

@ -525,7 +525,12 @@ fn run_test(
}
compiler.arg("--edition").arg(doctest.edition.to_string());
if !doctest.is_multiple_tests {
if doctest.is_multiple_tests {
// The merged test harness uses the `test` crate, so we need to actually allow it.
// This will not expose nightly features on stable, because crate attrs disable
// merging, and `#![feature]` is required to be a crate attr.
compiler.env("RUSTC_BOOTSTRAP", "1");
} else {
// Setting these environment variables is unneeded if this is a merged doctest.
compiler.env("UNSTABLE_RUSTDOC_TEST_PATH", &doctest.test_opts.path);
compiler.env(