diff options
| author | bors <bors@rust-lang.org> | 2025-07-31 12:04:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-31 12:04:04 +0000 |
| commit | 3fb1b53a9dbfcdf37a4b67d35cde373316829930 (patch) | |
| tree | 6d9cd701ae6cf01e27b08a9a59a2faa188840810 /src/librustdoc | |
| parent | 64ca23b6235732fa61c0a2b957c5d7e591e7c972 (diff) | |
| parent | 97e2806caae1142585bccadd9380bb304d0605b2 (diff) | |
| download | rust-3fb1b53a9dbfcdf37a4b67d35cde373316829930.tar.gz rust-3fb1b53a9dbfcdf37a4b67d35cde373316829930.zip | |
Auto merge of #144731 - samueltardieu:rollup-36y30k2, r=samueltardieu
Rollup of 4 pull requests Successful merges: - rust-lang/rust#136840 (Fix linker-plugin-lto only doing thin lto) - rust-lang/rust#144053 (Remove install Rust script from CI) - rust-lang/rust#144297 (Make `libtest::ERROR_EXIT_CODE` const public to not redefine it in rustdoc) - rust-lang/rust#144721 (`std_detect`: Linux 6.16 support for RISC-V) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/doctest.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs index 0bef091468f..35ace656638 100644 --- a/src/librustdoc/doctest.rs +++ b/src/librustdoc/doctest.rs @@ -409,7 +409,8 @@ pub(crate) fn run_tests( // We ensure temp dir destructor is called. std::mem::drop(temp_dir); times.display_times(); - // libtest::ERROR_EXIT_CODE is not public but it's the same value. + // FIXME(GuillaumeGomez): Uncomment the next line once #144297 has been merged. + // std::process::exit(test::ERROR_EXIT_CODE); std::process::exit(101); } } |