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

[jieyouxu]

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.

This also reverts #162318, since #162318 fixes an regression introduced in #162334.

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

[rustbot]

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

[Kobzol]

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]

📌 Commit 72aea01 has been approved by Kobzol

It is now in the queue for this repository.

[Zalathar]

The conflicting change is probably #162318, which I believe was an unrelated bugfix for the changes being reverted.

So if we go ahead with the revert, it should be fine to lose that change as long as (e.g.) ./x doc rustc_mir_build --open still manages to open the docs.

[Zalathar]

I have manually verified that after reverting both #162318 and #161716, ./x doc rustc_mir_build --open works fine, so my PR was indeed fixing a newly-introduced bug in the PR that is being reverted.

[notriddle]

I also tried running the notriddle@dbd6be9 test case on it, and it passes.

[rustbot]

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.

[rustbot]

⚠️ 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.
  • c84edb3

[jieyouxu]

Rebased. Now the revert is effectively both:

1. rustdoc: Enabling mergeable CCI broke the search functionality for the stdlib and for our internal docs #162334
2. bootstrap: Fix broken path for ./x doc compiler/rustc --open #162318 (since this is a follow-up fix for rustdoc: Enabling mergeable CCI broke the search functionality for the stdlib and for our internal docs #162334)

I checked locally that ./x doc rustc_middle --open still opens rustc_main docs.

[jieyouxu]

@bors r=Kobzol

[rust-bors]

📌 Commit c84edb3 has been approved by Kobzol

It is now in the queue for this repository.