Revert PR 83866

[pietroalbini]

#83866 caused multiple test failures when Rust's channel is changed from nightly to anything else. The PR will have to be landed again after the test suite is fixed.

The two kinds of test failures were:

• Rustdoc tests failed because the links in the generated HTML didn't point at nightly anymore, see [beta] Prepare beta 1.53.0 #84909 (comment)
• Rustdoc UI tests failed because the links included in error messages didn't point at nightly anymore, see [beta] Prepare beta 1.53.0 #84909 (comment)

r? @Mark-Simulacrum
cc @jyn514

[rust-highfive]

Some changes occurred in intra-doc-links.

cc @jyn514

[pietroalbini]

Changed this PR to fully revert #83866. Even the other commit included in it caused the beta release to fail.

[jyn514]

Reverting the whole pr is not necessary. You can just remove the match on the channel.

[jyn514]

Here's a better fix:

diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index c5fb54e52c7..c5f344630a6 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -2018,11 +2018,8 @@ fn disambiguator_error(
 ) {
     diag_info.link_range = disambiguator_range;
     report_diagnostic(cx.tcx, BROKEN_INTRA_DOC_LINKS, msg, &diag_info, |diag, _sp| {
-        let msg = format!(
-            "see https://doc.rust-lang.org/{}/rustdoc/linking-to-items-by-name.html#namespaces-and-disambiguators \
-             for more info about disambiguators",
-            crate::doc_rust_lang_org_channel(),
-        );
+        let msg = "see https://doc.rust-lang.org/nightly/rustdoc/linking-to-items-by-name.html#namespaces-and-disambiguators \
+             for more info about disambiguators";
         diag.note(&msg);
     });
 }

[Mark-Simulacrum]

Discussed on Zulip, decided to go with this for now.

@bors r+

[bors]

📌 Commit 5b34bf4 has been approved by Mark-Simulacrum