Skip to content

Document Cargo with in-tree rustdoc #146199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Sep 6, 2025
Merged

Document Cargo with in-tree rustdoc #146199

merged 6 commits into from
Sep 6, 2025
+145 −27

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Sep 4, 2025 •
edited
Loading

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Sep 4, 2025
jieyouxu
jieyouxu approved these changes Sep 4, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

Thanks

View changes since this review

@jieyouxu
Copy link
Member

jieyouxu commented Sep 4, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 4, 2025

📌 Commit b5f2a71 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2025
@bors
Copy link
Collaborator

bors commented Sep 4, 2025

⌛ Testing commit b5f2a71 with merge 30e8aea...

bors added a commit that referenced this pull request Sep 4, 2025
@bors
Auto merge of #146199 - Kobzol:bootstrap-cargo-doc, r=jieyouxu
30e8aea 
Document Cargo with in-tree rustdoc

Fixes https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc/topic/nightly.20rust.20doc.20seem.20corrupted.

r? `@jieyouxu`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Sep 4, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Sep 4, 2025

... Nightly feature detection...?

@jieyouxu jieyouxu 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 Sep 5, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Sep 5, 2025 •
edited
Loading

I'm not super sure how to cope with that tbh... Overriding rustc version string I suspect will cause funny problems. Hm... I need to double-check, maybe -Zallow-features=? EDIT: no, this uses channel detection only ☹️

@Kobzol
Copy link
Member Author

Kobzol commented Sep 5, 2025

Fixed the feature detection, modified staging to respect the top level stage, and added a test for compiler docs, which shows that Cargo is now documented with in-tree rustdoc.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2025
jieyouxu
jieyouxu approved these changes Sep 5, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, r=me once PR CI is green with the comment nit.

View changes since this review

@Kobzol
Copy link
Member Author

Kobzol commented Sep 5, 2025

@bors try

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Sep 5, 2025
@rust-bors
Auto merge of #146199 - Kobzol:bootstrap-cargo-doc, r=<try>
b918118 
Document Cargo with in-tree rustdoc

try-job: dist-x86_64-linux-alt
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-bors
Copy link

rust-bors bot commented Sep 5, 2025

💔 Test for b918118 failed: CI. Failed jobs:

@Kobzol
Copy link
Member Author

Kobzol commented Sep 5, 2025

Sigh.

@bors try

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Sep 5, 2025
@rust-bors
Auto merge of #146199 - Kobzol:bootstrap-cargo-doc, r=<try>
2519ca0 
Document Cargo with in-tree rustdoc

try-job: dist-x86_64-linux-alt
@rust-bors
Copy link

rust-bors bot commented Sep 5, 2025

☀️ Try build successful (CI)
Build commit: 2519ca0 (2519ca0a4df50ff37a41f71796960d2d39cc8873, parent: 9cd272dc85320e85a8c83a1a338870de52c005f3)

@Kobzol
Copy link
Member Author

Kobzol commented Sep 5, 2025

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Sep 5, 2025

📌 Commit b5c139b has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2025
@bors
Copy link
Collaborator

bors commented Sep 6, 2025

⌛ Testing commit b5c139b with merge 696dc01...

bors added a commit that referenced this pull request Sep 6, 2025
@bors
Auto merge of #146199 - Kobzol:bootstrap-cargo-doc, r=jieyouxu
696dc01 
Document Cargo with in-tree rustdoc

Fixes https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc/topic/nightly.20rust.20doc.20seem.20corrupted.

r? `@jieyouxu`

try-job: dist-x86_64-linux-alt
@tgross35 tgross35 mentioned this pull request Sep 6, 2025
Merged
@tgross35
Copy link
Contributor

tgross35 commented Sep 6, 2025

@bors retry rolled up

bors added a commit that referenced this pull request Sep 6, 2025
@bors
Auto merge of #146258 - tgross35:rollup-4hqggwa, r=tgross35
545819d 
Rollup of 2 pull requests

Successful merges:

 - #146199 (Document Cargo with in-tree rustdoc)
 - #146257 (std: Update `wasi` crate dependency)

Failed merges:

 - #146200 (Simplify rustdoc-gui tester by calling directly browser-ui-test)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease
Copy link
Member

fmease commented Sep 6, 2025 •
edited
Loading

Sorry to be that guy but in the future could you please reduce the amount of micro and fixup commits (e.g., the final two). Thanks!

@bors bors merged commit 14415c7 into rust-lang:master Sep 6, 2025
11 of 12 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Sep 6, 2025
rust-timer added a commit that referenced this pull request Sep 6, 2025
@rust-timer
Unrolled build for #146199
6ed7e3a 
Rollup merge of #146199 - Kobzol:bootstrap-cargo-doc, r=jieyouxu

Document Cargo with in-tree rustdoc

Fixes https://rust-lang.zulipchat.com/#narrow/channel/266220-t-rustdoc/topic/nightly.20rust.20doc.20seem.20corrupted.

r? `@jieyouxu`

try-job: dist-x86_64-linux-alt
@bors
Copy link
Collaborator

bors commented Sep 6, 2025

⌛ Testing commit b5c139b with merge 545819d...

@Kobzol Kobzol deleted the bootstrap-cargo-doc branch September 6, 2025 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.91.0
Development

Successfully merging this pull request may close these issues.
8 participants
@Kobzol @jieyouxu @bors @rust-log-analyzer @tgross35 @fmease @GuillaumeGomez @rustbot