Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 4, 2021

Builds on #84942. This makes the diagnostics consistent with the links.

@jyn514 jyn514 added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-diagnostics Area: Messages for errors, warnings, and lints S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 4, 2021
@jyn514 jyn514 force-pushed the channel-replace-rustdoc branch from 6d09f9d to caaa4a1 Compare June 4, 2021 13:53
@rust-log-analyzer

This comment has been minimized.

jyn514 added 2 commits June 4, 2021 14:18
 ## User-facing changes

- Intra-doc links to primitives that currently go to rust-lang.org/nightly/std/primitive.x.html will start going to channel that rustdoc was built with. Nightly will continue going to /nightly; Beta will link to /beta; stable compilers will link to /1.52.1 (or whatever version they were built as).
- Cross-crate links from std to core currently go to /nightly unconditionally. They will start going to /1.52.0 on stable channels (but remain the same on nightly channels).
- Intra-crate links from std to std (or core to core) currently go to the same URL they are hosted at; they will continue to do so. Notably, this is different from everything else because it can preserve the distinction between /stable and /1.52.0 by using relative links.

Note that "links" includes both intra-doc links and rustdoc's own
automatically generated hyperlinks.

 ## Implementation changes

- Update the testsuite to allow linking to /beta and /1.52.1 in docs
- Use an html_root_url for the standard library that's dependent on the channel

  This avoids linking to nightly docs on stable.

- Update rustdoc to use channel-dependent links for primitives from an
  unknown crate

- Set DOC_RUST_LANG_ORG_CHANNEL from bootstrap to ensure it's in sync
- Include doc.rust-lang.org in the channel
@jyn514 jyn514 force-pushed the channel-replace-rustdoc branch from caaa4a1 to 4c71610 Compare June 4, 2021 18:58
@jyn514 jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 4, 2021
@jyn514
Copy link
Member Author

jyn514 commented Jun 4, 2021

r? @Manishearth

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 4, 2021

📌 Commit 4c71610 has been approved by Manishearth

@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 Jun 4, 2021
@bors
Copy link
Collaborator

bors commented Jun 5, 2021

⌛ Testing commit 4c71610 with merge 34b9932...

@bors
Copy link
Collaborator

bors commented Jun 5, 2021

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing 34b9932 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2021
@bors bors merged commit 34b9932 into rust-lang:master Jun 5, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 5, 2021
@jyn514 jyn514 deleted the channel-replace-rustdoc branch June 5, 2021 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-diagnostics Area: Messages for errors, warnings, and lints merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants