Simplify doc meta mode#159473
Conversation
rustbot
added
A-run-make
|
r? @folkertdev rustbot has assigned @folkertdev. Use Why was this reviewer chosen?The reviewer was selected based on:
|
|
r? @camelid |
|
|
There was a problem hiding this comment.
I don't fully understand the purpose of the changes in this commit. Did --enable-index-page not work at all when CCI was enabled, prior to this change? Could you explain a bit?
There was a problem hiding this comment.
It didn’t work when running in no-crate finalize mode. It worked when you finalized and documented a crate at the same time.
| htmldocck().arg(&out_dir).arg("tango.rs").run(); | ||
| htmldocck().arg(&out_dir).arg("quebec.rs").run(); | ||
| htmldocck().arg(&out_dir).arg("sierra.rs").run(); | ||
| htmldocck().arg(&out_dir).arg("indigo.rs").run(); | ||
| htmldocck().arg(&out_dir).arg("romeo.rs").run(); |
There was a problem hiding this comment.
Unless I'm mistaken, it doesn't seem like there are any actual htmldocck @ has checks in these files? In particular, it seems like we should be testing for the presence/content of the index page (either in the form of htmldocck assertions or here in the rmake).
There was a problem hiding this comment.
Turns out indigo.rs has a bunch of @ has checks in it.
I've gone ahead and gotten rid of the no-op htmldocck lines, as well as cleaning up the unused build directives in those files.
There was a problem hiding this comment.
I forgot. Sorry.
I've pushed it now. c352016
There was a problem hiding this comment.
Where is the check that errors when both --read... and --write... are passed?
camelid
added
S-waiting-on-author
There was a problem hiding this comment.
Could you move all run-make tests into tests/run-make/rustdoc/ (and remove the rustdoc- prefix) or better yet into tests/run-make/rustdoc/merge-cross-crate-info/ (and remove the common prefix). CC #157860 ofc.
Since we're getting rid of the ability to do finalize and document at the same time, we can't actually do this in the rustdoc-html test build system and need to do it this way instead.
Co-authored-by: Noah Lev <37223377+camelid@users.noreply.github.com>
Co-authored-by: Noah Lev <37223377+camelid@users.noreply.github.com>
9e2125b to
d0fec14
Compare
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
5 participants
Follow up #159415 (comment)
Get rid of the mode where you can finalize the CCI and generate more docs at the same time. It isn't used in Cargo, and probably won't be used elsewhere?