Fix O(tests) stack usage in edition 2024 mergeable doctests #138281
Merged
Conversation
This file contains 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
|
rustbot has assigned @GuillaumeGomez. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
approved these changes
Mar 9, 2025
saethlin
force-pushed
the
mergeable-doctests-stacksize
branch
from
90fecc7 to
76ab62e
Compare
saethlin
force-pushed
the
mergeable-doctests-stacksize
branch
from
76ab62e to
1ccb982
Compare
|
Took me a while to figure out what was going on; I broke the test runner and somehow that made rustdoc fall back to not merging doctests. Should be good now, and I had to redesign the approach a bit to get it to compile 🤦 |
src/librustdoc/doctest/runner.rs
Outdated
| @@ -136,19 +133,23 @@ mod __doctest_mod {{ | |||
|
|
|||
| #[rustc_main] | |||
| fn main() -> std::process::ExitCode {{ | |||
| const TESTS: [test::TestDescAndFn; {nb_tests}] = [{ids}]; | |||
| let tests = {{ | |||
| let mut tests = Vec::new(); | |||
There was a problem hiding this comment.
Can you at least use with_capacity since we already have nb_tests?
saethlin
force-pushed
the
mergeable-doctests-stacksize
branch
from
1ccb982 to
295c70e
Compare
GuillaumeGomez
approved these changes
Mar 10, 2025
|
Thanks! @bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 10, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#137931 (Add remark for missing `llvm-tools` component re. `rustc_private` linker failures related to not finding LLVM libraries) - rust-lang#138138 (Pass `InferCtxt` to `InlineAsmCtxt` to properly taint on error) - rust-lang#138223 (Fix post-merge workflow) - rust-lang#138268 (Handle empty test suites in GitHub job summary report) - rust-lang#138278 (Delegation: fix ICE with invalid `MethodCall` generation) - rust-lang#138281 (Fix O(tests) stack usage in edition 2024 mergeable doctests) - rust-lang#138305 (Subtree update of `rust-analyzer`) - rust-lang#138306 (Revert "Use workspace lints for crates in `compiler/` rust-lang#138084") r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 10, 2025
Rollup merge of rust-lang#138281 - saethlin:mergeable-doctests-stacksize, r=GuillaumeGomez Fix O(tests) stack usage in edition 2024 mergeable doctests Fixes rust-lang#138248 The important change here is that we are not passing a potentially-large array by value. Between the fact that `TestFn` cannot be `Clone` and `test_main` takes a `Vec<TestDescAndFn>`, the only way to call `test::test_main` without O(tests) stack use is to call `Vec::push` many times. The normal test harness does not have this problem because it calls `test_main_static` or `test_main_static_abort`, which take `&[TestDescAndFn]`. Changing `test::test_main` to take a slice is not a simple change, so I'm avoiding doing it here.
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 #138248
The important change here is that we are not passing a potentially-large array by value. Between the fact that
TestFncannot beCloneandtest_maintakes aVec<TestDescAndFn>, the only way to calltest::test_mainwithout O(tests) stack use is to callVec::pushmany times.The normal test harness does not have this problem because it calls
test_main_staticortest_main_static_abort, which take&[TestDescAndFn]. Changingtest::test_mainto take a slice is not a simple change, so I'm avoiding doing it here.