Skip to content
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.

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

Revert PR 83866 #84950

Merged
merged 1 commit into from
May 6, 2021
Merged

Revert PR 83866 #84950

merged 1 commit into from
May 6, 2021

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented May 5, 2021

#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:

r? @Mark-Simulacrum
cc @jyn514

@rust-highfive
Copy link
Collaborator

Some changes occurred in intra-doc-links.

cc @jyn514

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 5, 2021
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

That PR caused multiple test failures when Rust's channel is changed
from nightly to anything else. The commit will have to be landed again
after the test suite is fixed.
@pietroalbini pietroalbini changed the title Revert "Reuse logic for determining the channel in the rest of rustdoc" Revert PR 83866 May 5, 2021
@pietroalbini
Copy link
Member Author

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

@jyn514
Copy link
Member

jyn514 commented May 5, 2021

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

@jyn514
Copy link
Member

jyn514 commented May 5, 2021

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
Copy link
Member

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

@bors r+

@bors
Copy link
Contributor

bors commented May 5, 2021

📌 Commit 5b34bf4 has been approved by Mark-Simulacrum

@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 May 5, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2021
…crum

[beta] Prepare beta 1.53.0

Along with updating the channel and updating the bootstrap compiler, this also includes:

* 692454d - Fixes the diagnostics difference we had for some cycles already
* 9157430 - Disables the known broken RLS builder on AArch64 Windows
* rust-lang#84183 - Update RELEASES.md for 1.52.0
* rust-lang#84950 - Revert PR 83866
* rust-lang#84886 - Update RLS and Rustfmt

Changes we backported to 1.52.0 that we also need to include in 1.53.0 to avoid regressing:

* rust-lang#84867 - rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType
* rust-lang#84759 - [beta] remove assert_matches
* rust-lang#83171 - Revert PR 81473 to resolve (on beta) issues 81626 and 81658.

r? `@ghost`
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 6, 2021
…rk-Simulacrum

Revert PR 83866

rust-lang#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 rust-lang#84909 (comment)
* Rustdoc UI tests failed because the links included in error messages didn't point at nightly anymore, see rust-lang#84909 (comment)

r? `@Mark-Simulacrum`
cc `@jyn514`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#83507 (Implement RFC 2951: Native link modifiers)
 - rust-lang#84328 (Stablize {HashMap,BTreeMap}::into_{keys,values})
 - rust-lang#84712 (Simplify chdir implementation and minimize unsafe block)
 - rust-lang#84851 (:arrow_up: rust-analyzer)
 - rust-lang#84923 (Only compute Obligation `cache_key` once  in `register_obligation_at`)
 - rust-lang#84945 (E0583: Include secondary path in error message)
 - rust-lang#84949 (Fix typo in `MaybeUninit::array_assume_init` safety comment)
 - rust-lang#84950 (Revert PR 83866)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ccc820e into rust-lang:master May 6, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 6, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 7, 2021
rustdoc: Link to the docs on namespaces when an unknown disambiguator is found

This was reverted in rust-lang#84950; this re-lands the changes, but without different behavior depending on the channel.

r? `@camelid` cc `@pietroalbini`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants