Repository navigation
[rustdoc] Move the creation of IndividualTestOptions into the test runner closure to ensure the temporary folder is removed right after the test is done running - #164202
Merged
rust-bors[bot] merged 1 commit intoOct 12, 2026
Conversation
rustbot
added
A-run-make
Collaborator
|
|
GuillaumeGomez
commented
Oct 12, 2026
| @@ -0,0 +1,15 @@ | |||
|
|
|||
| running 1 test | |||
Member
Author
There was a problem hiding this comment.
This change is because we used to try to make the temporary directly ahead of the DynTestFn closure when using --persist-doctest, so before the doctest was even running. But it actually doesn't make much sense to have a different behaviour so it's now moved inside the DynTestFn closure and has the same output as when --persist-doctest isn't used.
RalfJung
reviewed
Oct 12, 2026
Comment on lines
1174
to
1175
| doctest_run_fn( | ||
| &rustdoc_test_options, |
Member
There was a problem hiding this comment.
I think this means you can change doctest_run_fn mak to taking rustdoc_test_options by-value as it was before my PR.
Member
Author
There was a problem hiding this comment.
Ah indeed, missed that.
RalfJung
reviewed
Oct 12, 2026
| /// entry.as_ref().unwrap().file_name().to_str().unwrap().starts_with("rustdoctest") | ||
| /// }) | ||
| /// .count(); | ||
| /// assert_eq!(count, 2); |
Member
There was a problem hiding this comment.
Why is 2 the right number here? Shouldn't it be 1 if the previous test got cleaned up?
Member
Author
There was a problem hiding this comment.
We create a first temp dir where we write the rustdoc-cfgs file which contains the list of all args to be passed to the doctests. But I'll write a code comment to explain it.
theemathas
added
the
beta-nominated
GuillaumeGomez
force-pushed
the
fix-doctest-temp-removal
branch
from
October 12, 2026 10:58
427c050 to
917a1cb
Compare
…sure to ensure the temporary folder is removed right after the test is done running
GuillaumeGomez
force-pushed
the
fix-doctest-temp-removal
branch
from
October 12, 2026 11:00
917a1cb to
2cb8b0b
Compare
Member
Author
|
Added the code comment and cleaned up rustdoc code a bit more. |
Member
|
LGTM, thanks a lot. :) |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 12, 2026
…moval, r=RalfJung,Urgau [rustdoc] Move the creation of `IndividualTestOptions` into the test runner closure to ensure the temporary folder is removed right after the test is done running Fixes rust-lang#164145. Fixes one missed case in rust-lang#161868: the `IndividualTestOptions` should have been created directly into the `DynTestFn` closure so its temporary directory is removed right after it's done running. r? @RalfJung
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Oct 12, 2026
…moval, r=RalfJung,Urgau [rustdoc] Move the creation of `IndividualTestOptions` into the test runner closure to ensure the temporary folder is removed right after the test is done running Fixes rust-lang#164145. Fixes one missed case in rust-lang#161868: the `IndividualTestOptions` should have been created directly into the `DynTestFn` closure so its temporary directory is removed right after it's done running. r? @RalfJung
This was referenced Oct 12, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 12, 2026
…uwer Rollup of 8 pull requests Successful merges: - #164196 (`rust-analyzer` subtree update) - #164037 (Restrict application of optimization attributes from instance) - #164201 (Improve `--bless` output for `tests/debuginfo`) - #164202 ([rustdoc] Move the creation of `IndividualTestOptions` into the test runner closure to ensure the temporary folder is removed right after the test is done running) - #162140 (fn_addr_eq: we actually can guarantee basically nothing) - #163946 (Fix transmutability type mismatch bug) - #163978 (Copy over some methods from At to InferCtxt) - #164045 (-Zassumptions-on-binders: replace region vars with bound vars when handling alias outlives')
rust-bors Bot
pushed a commit
that referenced
this pull request
Oct 12, 2026
Rollup merge of #164202 - GuillaumeGomez:fix-doctest-temp-removal, r=RalfJung,Urgau [rustdoc] Move the creation of `IndividualTestOptions` into the test runner closure to ensure the temporary folder is removed right after the test is done running Fixes #164145. Fixes one missed case in #161868: the `IndividualTestOptions` should have been created directly into the `DynTestFn` closure so its temporary directory is removed right after it's done running. r? @RalfJung
Contributor
|
removing t-compiler since this seems to be entirely T-rustdoc (probably good to backport, imo) |
rustbot
removed
the
T-compiler
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #164145.
Fixes one missed case in #161868: the
IndividualTestOptionsshould have been created directly into theDynTestFnclosure so its temporary directory is removed right after it's done running.r? @RalfJung