Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomez GuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

When working on #161944 (comment), I realized that a lot of doctests in rustdoc-html testsuite were not in the correct testsuite, so moving them in the right location.

Because you're the one who made me realize it, here goes @fmease (thanks!) :p

r? @fmease

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomez GuillaumeGomez Aug 29, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtool
run-make/rustdoc/default-output/output-default.stdout:143:        --test-runtool The tool to run tests with when building for a different target than host
run-make/rustdoc/default-output/output-default.stdout:145:        --test-runtool-arg One argument (of possibly many) to pass to the runtool
run-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.
run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.
run-make/rustdoc/doctest/runtool/rmake.rs:32:        .arg("--test-runtool")
run-make/rustdoc/doctest/test_harness/rmake.rs:26:        .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment thread tests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

r=me once my comments are addressed

View changes since this review

Comment thread tests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmease fmease 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 29, 2026
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
Member Author

@bors r=fmease rollup

@rust-bors

rust-bors Bot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 29, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 29, 2026
Rollup of 7 pull requests

Successful merges:

 - #160941 (Enforce safety comments on `alloc`)
 - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off)
 - #157968 (Preserve ambiguous glob lint for subtrait method picks)
 - #161514 (rework handling of doc attributes on macro calls)
 - #161944 (rustdoc: Take into account edition information for keyword highlighting)
 - #161974 (remove rustc_never_type_options attr remnants)
 - #161978 (Move rustdoc ui doctests into the right testsuite)

Failed merges:

 - #161702 (Use `drop_guard` in some places in {core,alloc,std})
@rust-bors
rust-bors Bot merged commit ce7aa01 into rust-lang:main Aug 30, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease

Move rustdoc ui doctests into the right testsuite

When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location.

Because you're the one who made me realize it, here goes @fmease (thanks!) :p

r? @fmease
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants