Skip to content

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Sep 25, 2025

Fixes #146960.

Small corner case that happened in case everything went fine and there was only merged doctests.

r? lolbinarycat

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 25, 2025
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-doctest-compilation-time-display branch from 5a77d88 to 2255e82 Compare September 25, 2025 16:29
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-doctest-compilation-time-display branch from 2255e82 to 9844d2e Compare September 25, 2025 21:43
@GuillaumeGomez
Copy link
Member Author

Added the missing normalizations.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-doctest-compilation-time-display branch from 9844d2e to b8e4db9 Compare September 25, 2025 22:50
@GuillaumeGomez
Copy link
Member Author

I keep discovering more tests that were actually buggy. ^^'

Anyway, fixed the run-make one as well.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-doctest-compilation-time-display branch from b8e4db9 to 1e458ea Compare September 25, 2025 23:54
@GuillaumeGomez
Copy link
Member Author

CI passed. \o/

Copy link
Contributor

@lolbinarycat lolbinarycat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a few typos and improvable names, but other than that it looks good!

r=me with typos fixed and CI passing

View changes since this review

use run_make_support::rfs::write;
use run_make_support::{cwd, rustdoc};

fn check_present_of_compilation_time_report(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fn check_present_of_compilation_time_report(
fn assert_presence_of_compilation_time_report(

check -> assert since this function asserts directly instead of returning a bool.

present -> presence for grammaticality.

true,
true,
);
// Checking with only fainling merged doctests.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Checking with only fainling merged doctests.
// Checking with only failing merged doctests.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-doctest-compilation-time-display branch from 1e458ea to b7e444d Compare September 26, 2025 20:04
@GuillaumeGomez
Copy link
Member Author

@bors r=lolbinarycat rollup

@bors
Copy link
Collaborator

bors commented Sep 27, 2025

📌 Commit b7e444d has been approved by lolbinarycat

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 27, 2025
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 27, 2025
…tion-time-display, r=lolbinarycat

Fix doctest compilation time display

Fixes rust-lang#146960.

Small corner case that happened in case everything went fine and there was only merged doctests.

r? lolbinarycat
bors added a commit that referenced this pull request Sep 27, 2025
Rollup of 9 pull requests

Successful merges:

 - #140482 (std::net: update tcp deferaccept delay type to Duration.)
 - #146037 (Introduce CoerceShared lang item and trait, and basic Reborrow tests)
 - #146732 (tests: relax expectations after llvm change 902ddda120a5)
 - #147018 (re-order normalizations in run-make linker-warning test)
 - #147032 (Fix doctest compilation time display)
 - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`)
 - #147050 (PassWrapper: update for new PGOOptions args in LLVM 22)
 - #147075 (Make `def_path_hash_to_def_id` not panic when passed an invalid hash)
 - #147076 (update issue number for more_float_constants)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Sep 27, 2025
Rollup of 8 pull requests

Successful merges:

 - #146037 (Introduce CoerceShared lang item and trait, and basic Reborrow tests)
 - #146732 (tests: relax expectations after llvm change 902ddda120a5)
 - #147018 (re-order normalizations in run-make linker-warning test)
 - #147032 (Fix doctest compilation time display)
 - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`)
 - #147050 (PassWrapper: update for new PGOOptions args in LLVM 22)
 - #147075 (Make `def_path_hash_to_def_id` not panic when passed an invalid hash)
 - #147076 (update issue number for more_float_constants)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a11a211 into rust-lang:master Sep 28, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 28, 2025
rust-timer added a commit that referenced this pull request Sep 28, 2025
Rollup merge of #147032 - GuillaumeGomez:fix-doctest-compilation-time-display, r=lolbinarycat

Fix doctest compilation time display

Fixes #146960.

Small corner case that happened in case everything went fine and there was only merged doctests.

r? lolbinarycat
@GuillaumeGomez GuillaumeGomez deleted the fix-doctest-compilation-time-display branch September 28, 2025 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merged doctest compilation time is not reported if all doctests are merged
5 participants