Fix doctest output json #144908

GuillaumeGomez · 2025-08-04T15:03:01Z

Hopefully it will work with the new changes in libtest without needing to do both at once.

This PR moves the rustdoc merged doctest extra information directly into libtest to ensure they share the same rendering to prevent the bug uncovered in #144798.

cc @lolbinary (as you reviewed the first PR)

And since we're making changes to libtest:

r? @Amanieu

GuillaumeGomez · 2025-08-04T15:14:22Z

This is very frustrating that libtest cannot be used like any other dependency. Is there a reason to that @Kobzol ?

Kobzol · 2025-08-04T15:18:10Z

Well, that is kind one of the outputs of the stage0 redesign. cfg(bootstrap) has moved from the stdlib to the compiler (so rustc and rustdoc). If you need to use new unstable library APIs (which includes libtest) in rustc/rustdoc, you have to support both stage0 and stage1 with cfg(bootstrap) until beta is bumped.

GuillaumeGomez · 2025-08-04T15:19:47Z

Like usual, I will wait for the separate PR I opened to be merged and available.

lolbinarycat · 2025-08-04T21:54:34Z

We could just decide stage 1 rustdoc shouldn't exist, though that would mean that testing rustdoc would be slightly more work if you're not using download-rustc, since you could no longer just run the tests against stage1 rustdoc to prevent an extra rebuild of rustc (useful when making changes to compiler queries only used by rustdoc)

GuillaumeGomez · 2025-08-05T09:10:04Z

I'd rather not. ^^'

Once upon a time, changing libtest worked fine with rustdoc stage 1. Not sure when and why it changed, makes things more convoluted.

Kobzol · 2025-08-05T10:23:16Z

It changed with the stage0 redesign. Before building in-tree libstd was required to build rustc, but not anymore (https://blog.rust-lang.org/inside-rust/2025/05/29/redesigning-the-initial-bootstrap-sequence/).

…merged-doctests, r=Amanieu Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information This PR is the first commit of rust-lang#144908. Sadly, it seems like we can't do all of it at once... r? `@Amanieu`

…merged-doctests, r=Amanieu Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information This PR is the first commit of rust-lang#144908. Sadly, it seems like we can't do all of it at once... r? ``@Amanieu``

Rollup merge of #144909 - GuillaumeGomez:extend-libtest-for-merged-doctests, r=Amanieu Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information This PR is the first commit of #144908. Sadly, it seems like we can't do all of it at once... r? ``@Amanieu``

…ctests, r=Amanieu Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information This PR is the first commit of rust-lang/rust#144908. Sadly, it seems like we can't do all of it at once... r? ``@Amanieu``

bors · 2025-08-10T18:53:10Z

☔ The latest upstream changes (presumably #145210) made this pull request unmergeable. Please resolve the merge conflicts.

…merged-doctests, r=Amanieu Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information This PR is the first commit of rust-lang#144908. Sadly, it seems like we can't do all of it at once... r? ``@Amanieu``

…cified

rustbot · 2025-10-03T16:14:45Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

GuillaumeGomez · 2025-10-03T19:27:33Z

Since new libtest version was released, CI is now happy. Still need to change how libtest is handled in bootstrap.

GuillaumeGomez · 2025-10-03T19:28:03Z

r? fmease

rustbot · 2025-10-03T19:28:08Z

fmease is not on the review rotation at the moment.
They may take a while to respond.

…json, r=fmease Fix doctest output json Fixes rust-lang#144798. Hopefully it will work with the new changes in `libtest` without needing to do both at once. This PR moves the `rustdoc` merged doctest extra information directly into `libtest` to ensure they share the same rendering to prevent the bug uncovered in rust-lang#144798. cc `@lolbinary` (as you reviewed the first PR) And since we're making changes to `libtest`: r? `@Amanieu`

Rollup of 6 pull requests Successful merges: - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144908 (Fix doctest output json) - #147309 (Add documentation about unwinding to wasm targets) - #147328 (Implement non-poisoning `Mutex::with_mut`, `RwLock::with` and `RwLock::with_mut`) - #147337 (Make `fmt::Write` a diagnostic item) - #147349 (Improve the advice given by panic_immediate_abort) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar · 2025-10-05T01:47:38Z

Failed in rollup (test-various): #147352 (comment)

@bors r-

Zalathar · 2025-10-05T01:48:27Z

@bors try jobs=test-various

Fix doctest output json try-job: test-various

rust-bors · 2025-10-05T02:34:20Z

💔 Test for 588437d failed: CI. Failed jobs:

try - test-various (web logs, extended logs)

fmease · 2025-10-05T07:59:49Z

Likely needs ignore-cross-compile instead of needs-target-std, we seem to be executing an incompatible binary.

GuillaumeGomez · 2025-10-05T09:13:39Z

Thanks for the hint! Let's check if it works now.

@bors try jobs=test-various

Fix doctest output json try-job: test-various

rust-bors · 2025-10-05T10:45:45Z

☀️ Try build successful (CI)
Build commit: d396f05 (d396f05cb466fb8a8ef7cabe171e5a8ec2d527a9, parent: e2c96cc06bdbdbc6f59c7551194d6a742260d6ff)

GuillaumeGomez · 2025-10-05T11:01:27Z

Seems like it fixed the issue, thanks @fmease!

@bors r=fmease rollup

bors · 2025-10-05T11:01:29Z

📌 Commit 99c7959 has been approved by fmease

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - #144908 (Fix doctest output json) - #147262 (Make #[link="dl"] an FCW rather than an error) - #147364 (update autodiff testcases) - #147367 (Trivial code cleanup in resolve) - #147369 (Fill out AVR target metadata) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144908 - GuillaumeGomez:fix-doctest-output-json, r=fmease Fix doctest output json Fixes #144798. Hopefully it will work with the new changes in `libtest` without needing to do both at once. This PR moves the `rustdoc` merged doctest extra information directly into `libtest` to ensure they share the same rendering to prevent the bug uncovered in #144798. cc `@lolbinary` (as you reviewed the first PR) And since we're making changes to `libtest`: r? `@Amanieu`

rustbot assigned Amanieu Aug 4, 2025

This comment has been minimized.

Sign in to view

GuillaumeGomez mentioned this pull request Aug 4, 2025

Add new test::print_merged_doctests_times used by rustdoc to display more detailed time information #144909

Merged

GuillaumeGomez force-pushed the fix-doctest-output-json branch from 2413d04 to 51087b2 Compare August 8, 2025 16:21

This comment has been minimized.

Sign in to view

Display merged doctests times as expected depending on the format spe…

5888945

…cified

GuillaumeGomez force-pushed the fix-doctest-output-json branch from 51087b2 to 4a22063 Compare October 3, 2025 16:14

rustbot assigned fmease and unassigned Amanieu Oct 3, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 4, 2025

matthiaskrgr mentioned this pull request Oct 4, 2025

Rollup of 6 pull requests #147352

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 5, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Oct 5, 2025

Auto merge of #144908 - GuillaumeGomez:fix-doctest-output-json, r=<try>

588437d

Fix doctest output json try-job: test-various

This comment has been minimized.

Sign in to view

Add regression test for rustdoc output format

99c7959

GuillaumeGomez force-pushed the fix-doctest-output-json branch from 605496b to 99c7959 Compare October 5, 2025 09:13

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Oct 5, 2025

Auto merge of #144908 - GuillaumeGomez:fix-doctest-output-json, r=<try>

d396f05

Fix doctest output json try-job: test-various

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 5, 2025

Zalathar mentioned this pull request Oct 5, 2025

Rollup of 5 pull requests #147371

Merged

bors merged commit cc1a806 into rust-lang:master Oct 5, 2025
11 checks passed

rustbot added this to the 1.92.0 milestone Oct 5, 2025

GuillaumeGomez deleted the fix-doctest-output-json branch October 6, 2025 10:16

Fix doctest output json #144908

Fix doctest output json #144908

Conversation

GuillaumeGomez commented Aug 4, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Aug 4, 2025

Uh oh!

Kobzol commented Aug 4, 2025

Uh oh!

GuillaumeGomez commented Aug 4, 2025

Uh oh!

lolbinarycat commented Aug 4, 2025

Uh oh!

GuillaumeGomez commented Aug 5, 2025

Uh oh!

Kobzol commented Aug 5, 2025

Uh oh!

This comment has been minimized.

bors commented Aug 10, 2025

Uh oh!

rustbot commented Oct 3, 2025

Uh oh!

GuillaumeGomez commented Oct 3, 2025

Uh oh!

GuillaumeGomez commented Oct 3, 2025

Uh oh!

rustbot commented Oct 3, 2025

Uh oh!

Zalathar commented Oct 5, 2025

Uh oh!

Zalathar commented Oct 5, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Oct 5, 2025

Uh oh!

fmease commented Oct 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Oct 5, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Oct 5, 2025

Uh oh!

GuillaumeGomez commented Oct 5, 2025

Uh oh!

bors commented Oct 5, 2025

Uh oh!

Uh oh!

Uh oh!

GuillaumeGomez commented Aug 4, 2025 •

edited by rustbot

Loading

fmease commented Oct 5, 2025 •

edited

Loading