Skip to content

Revert "bootstrap: Enable rustdoc mergeable CCI for std and internal docs #161716" - #162339

Open
jieyouxu wants to merge 1 commit into
rust-lang:mainfrom
jieyouxu:revert-mergeable-cci
Open

Revert "bootstrap: Enable rustdoc mergeable CCI for std and internal docs #161716"#162339
jieyouxu wants to merge 1 commit into
rust-lang:mainfrom
jieyouxu:revert-mergeable-cci

Conversation

@jieyouxu

@jieyouxu jieyouxu commented Sep 5, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

cc #162334.

It seems that #161716 still has some issues with combining cross-crate info? Let's revert for now and reland once we figure out why we are regressing the search results 🤔 It's not obvious to me.

I built rustc-docs dist component locally, and at least locally with #161716 reverted I can find rustc::ast::Attribute "normally" from the search results.

This reverts commit a69a632, reversing changes made to c33d8f3.

r? @Kobzol (or notriddle/bootstrap/rustdoc)
cc @notriddle

@jieyouxu
Revert "Auto merge of rust-lang#161716 - notriddle:remake-bootstrap-d…
72aea01 
…oc-mergeable, r=Kobzol,jieyouxu"

This reverts commit a69a632, reversing
changes made to c33d8f3.
@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 5, 2026
@rustbot

rustbot commented Sep 5, 2026

Copy link
Copy Markdown
Collaborator

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

@rustbot

rustbot commented Sep 5, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

@jieyouxu jieyouxu mentioned this pull request Sep 5, 2026
Open
@jieyouxu jieyouxu changed the title Revert "Auto merge of #161716 - notriddle:remake-bootstrap-doc-mergeable, r=Kobzol,jieyouxu" Revert "bootstrap: Enable rustdoc mergeable CCI for std and internal docs #161716" Sep 5, 2026
@Kobzol

Kobzol commented Sep 5, 2026

Copy link
Copy Markdown
Member

Weird. I thought I diffed the generated docs locally and they were essentially the same. Maybe I didn't diff the JS files.. 🤔

Thanks.

@bors r+

@rust-bors

rust-bors Bot commented Sep 5, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 72aea01 has been approved by Kobzol

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. 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, 2026
@rust-bors

rust-bors Bot commented Sep 5, 2026

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #162333) made this pull request unmergeable. Please resolve the merge conflicts by rebasing.

This pull request was unapproved.

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

Reviewers

No reviews

Assignees

@Kobzol Kobzol

Labels

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)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jieyouxu @rustbot @Kobzol