Skip to content

Move more rustdoc-html tests using --test into the right folder - #162014

Open
GuillaumeGomez wants to merge 2 commits into
rust-lang:mainfrom
GuillaumeGomez:more-ui-tests
Open

Move more rustdoc-html tests using --test into the right folder#162014
GuillaumeGomez wants to merge 2 commits into
rust-lang:mainfrom
GuillaumeGomez:more-ui-tests

Conversation

@GuillaumeGomez

@GuillaumeGomez GuillaumeGomez commented Aug 30, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

View all comments

Follow-up of #161944.

I double-checked if more rustdoc-html tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in compiletest I guess, doesn't seem like a tidy thing).

Oh also second commit is me realizing that some ui tests were using compile-args (which doesn't exist anymore) and without @. Anyway, fixed that too.

r? @fmease

@rustbot rustbot added 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 Aug 30, 2026
fmease
fmease reviewed Aug 30, 2026
View reviewed changes

@fmease fmease left a comment •
edited by rustbot
Loading

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.

review of 1st commit

View changes since this review

Comment thread tests/rustdoc-ui/doctest/async-move-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/comment-in-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/edition-doctest.stdout Outdated
Comment thread tests/rustdoc-ui/doctest/force-target-feature.rs Outdated
Comment thread tests/rustdoc-ui/doctest/force-target-feature.rs
fmease
fmease approved these changes Aug 30, 2026
View reviewed changes

@fmease fmease left a comment •
edited
Loading

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.

Nice! Thanks a lot!

I wonder if we should at some point modify compiletest or extend tidy to error on rustdoc-html/ tests that don't contain any HtmlDocCk directives... hmm, maybe that's a horrible idea

r=me once nits addressed

View changes since this review

Comment thread tests/rustdoc-ui/lints/renamed-lint-still-applies.rs Outdated
Comment on lines +1 to +2
//@ compile-flags: --crate-type lib

@fmease fmease Aug 30, 2026

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.

Suggested change
//@ compile-flags: --crate-type lib

or remove it altogether since it's not really relevant (rustdoc doesn't look for main even if the crate type is bin)

@GuillaumeGomez GuillaumeGomez Aug 30, 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.

Yeah actually I need to remove it.

Comment thread tests/ui/lint/forbid-error-capped.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 30, 2026
@GuillaumeGomez

GuillaumeGomez commented Aug 30, 2026

Copy link
Copy Markdown
Member Author

I wonder if we should modify compiletest or extend tidy to error on rustdoc-html/ tests that don't contain any HtmlDocCk directives... hmm, maybe that's a horrible idea

On it. ;)

I'll send a patch to prevent that in the future (in compiletest I guess, doesn't seem like a tidy thing).

fmease
fmease reviewed Aug 30, 2026
View reviewed changes
Comment thread tests/ui/lint/forbid-error-capped.rs
@@ -1,5 +1,4 @@
//@ check-pass
// compile-args: --cap-lints=warn -Fwarnings

@fmease fmease Aug 30, 2026 •
edited by rustbot
Loading

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.

Wait, this should be converted to //@ compile-flags like you did before. This test specifically intended to test the interaction between --cap-lints=warn and -Fwarnings as the paragraph states below.

Or did that lead to a failure? If so we might want to open a GH issue & investigate further.

View changes since the review

fmease
fmease reviewed Aug 30, 2026
View reviewed changes
Comment thread tests/rustdoc-ui/lints/renamed-lint-still-applies.rs Outdated

@fmease fmease Aug 30, 2026 •
edited
Loading

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.

Accidental removal while trying to apply #162014 (comment) (there's still the corresp. *.stderr file)?.

View changes since the review

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 30, 2026
Open
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez

GuillaumeGomez commented Aug 31, 2026

Copy link
Copy Markdown
Member Author

@bors r=fmease rollup

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 614d9ea 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 31, 2026
@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 31, 2026
@rustbot

rustbot commented Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 31, 2026
@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit fa9cd5bd4c583c3b5311698485482ad514026c30 was pushed.

This pull request was unapproved.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 31, 2026
@GuillaumeGomez

GuillaumeGomez commented Aug 31, 2026

Copy link
Copy Markdown
Member Author

Arf, forgot it was approved, gonna open a new PR including this one and #161944.

@bors r=fmease

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 7357962 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 31, 2026
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-bors rust-bors Bot 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 Aug 31, 2026
@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit 815bbce9794fce9b691a9abe8558ef05ba95354a was pushed.

This pull request was unapproved.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez

GuillaumeGomez commented Aug 31, 2026

Copy link
Copy Markdown
Member Author

@bors r=fmease rollup

@rust-bors

rust-bors Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 614d9ea 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 31, 2026
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 31, 2026
@GuillaumeGomez
Rollup merge of rust-lang#162014 - GuillaumeGomez:more-ui-tests, r=fm…
42bd805 
…ease

Move more `rustdoc-html` tests using `--test` into the right folder

Follow-up of rust-lang#161944.

I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing).

Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too.

r? @fmease
@GuillaumeGomez GuillaumeGomez mentioned this pull request Aug 31, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 31, 2026
@JonathanBrouwer
Rollup merge of rust-lang#162014 - GuillaumeGomez:more-ui-tests, r=fm…
5479bda 
…ease

Move more `rustdoc-html` tests using `--test` into the right folder

Follow-up of rust-lang#161944.

I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing).

Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too.

r? @fmease
@JonathanBrouwer JonathanBrouwer mentioned this pull request Aug 31, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Aug 31, 2026
@bors
Auto merge of #162089 - JonathanBrouwer:rollup-C05CNwv, r=JonathanBro…
e189e9b 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #162045 (`rust-analyzer` subtree update)
 - #162077 (compiler-builtins subtree update)
 - #137720 (support `#[target_feature(enable = ...)]` on `#[naked]` functions)
 - #160534 (stabilize smart pointer map functions)
 - #160551 (mir_build: Clearly distinguish or/refutable/irrefutable patterns during match lowering)
 - #161929 (explicitly track inherent const generic args kind)
 - #162063 (Switch dist-aarch64-linux to EC2 and update dist-x86_64-linux)
 - #161937 (A series of Polonius Alpha refactors)
 - #162014 (Move more `rustdoc-html` tests using `--test` into the right folder)
 - #162051 (`rustc_feature` cleanups)
 - #162055 (remove `_{style}` recovery for diagnostic structs)
 - #162075 (Move track_caller on closures gating to attribute parsing)
jhpratt added a commit to jhpratt/rust that referenced this pull request Sep 1, 2026
@jhpratt
Rollup merge of rust-lang#162014 - GuillaumeGomez:more-ui-tests, r=fm…
ce67918 
…ease

Move more `rustdoc-html` tests using `--test` into the right folder

Follow-up of rust-lang#161944.

I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing).

Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too.

r? @fmease
@jhpratt jhpratt mentioned this pull request Sep 1, 2026
Closed
@jhpratt

jhpratt commented Sep 1, 2026

Copy link
Copy Markdown
Member

@bors r- #162100 (comment)

@rust-bors rust-bors Bot 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 Sep 1, 2026
@rust-bors

rust-bors Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

This PR was contained in a rollup (#162100), which was unapproved.

View changes since this unapproval

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez @rust-log-analyzer @rustbot @jhpratt @fmease