Skip to content

Simplify doc meta mode#159473

Open
notriddle wants to merge 4 commits into
rust-lang:mainfrom
notriddle:rename-parts-to-dep-meta
Open

Simplify doc meta mode#159473
notriddle wants to merge 4 commits into
rust-lang:mainfrom
notriddle:rename-parts-to-dep-meta

Conversation

@notriddle

Copy link
Copy Markdown
Contributor

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?

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.
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jul 17, 2026
@rustbot

rustbot commented Jul 17, 2026

Copy link
Copy Markdown
Collaborator

r? @folkertdev

rustbot has assigned @folkertdev.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 74 candidates
  • Random selection from 17 candidates

@notriddle

Copy link
Copy Markdown
Contributor Author

r? @camelid

@rustbot rustbot assigned camelid and unassigned folkertdev Jul 17, 2026
@rustbot

rustbot commented Jul 17, 2026

Copy link
Copy Markdown
Collaborator

camelid is currently at their maximum review capacity.
They may take a while to respond.

@camelid camelid Jul 23, 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.

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?

View changes since the review

Comment on lines +94 to +98
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();

@camelid camelid Jul 23, 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.

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).

View changes since the review

Comment thread src/librustdoc/lib.rs

@camelid camelid Jul 23, 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.

Where is the check that errors when both --read... and --write... are passed?

View changes since the review


If both `--write-doc-meta-dir` and `--read-doc-meta-dir` are specified, the crate metadata will be
written to both the HTML `--out-dir` and to the supplied `--write-doc-meta-dir`.
Both `--write-doc-meta-dir` and `--read-doc-meta-dir` can't be supplied at once.

@camelid camelid Jul 23, 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
Both `--write-doc-meta-dir` and `--read-doc-meta-dir` can't be supplied at once.
`--write-doc-meta-dir` and `--read-doc-meta-dir` cannot both be passed to the same rustdoc invocation.

View changes since the review

When `--read-doc-meta-dir` is supplied, rustdoc runs in *finalize mode*. It will read the data from
the supplied directory, and will write it to the doc output directory in the form that the web
frontend will use.
When `--read-doc-meta-dir` is supplied, it runs it in *finalize mode*. No crate source code is

@camelid camelid Jul 23, 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
When `--read-doc-meta-dir` is supplied, it runs it in *finalize mode*. No crate source code is
When `--read-doc-meta-dir` is supplied, rustdoc runs in *finalize mode*. No crate source code is

View changes since the review

@camelid camelid 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 Jul 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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

Development

Successfully merging this pull request may close these issues.

4 participants