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

rustdoc: Move crate loader to collect_intra_doc_links::early #84101

Merged
merged 2 commits into from
Apr 12, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 11, 2021

This groups the similar code together, and also allows making most of collect_intra_doc_links private again.

This builds on #84066, but it wouldn't be too hard to base it off master if you want this to land first.
Helps with #83761.

r? manishearth

Fixes #84046

Previously, rustdoc would panic on links to external crates if they were
surrounded by backticks.
@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name labels Apr 11, 2021
@rust-highfive

This comment has been minimized.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2021
@jyn514 jyn514 mentioned this pull request Apr 11, 2021
6 tasks
@rust-log-analyzer

This comment has been minimized.

This groups the similar code together, and also allows making most of collect_intra_doc_links private again
Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me, fine to land this in lieu of landing the other PR.

@jyn514
Copy link
Member Author

jyn514 commented Apr 11, 2021

@bors r=Manishearth

@bors
Copy link
Contributor

bors commented Apr 11, 2021

📌 Commit cba5073 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 Apr 11, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#83669 (Issue 81508 fix)
 - rust-lang#84014 (Improve trait/impl method discrepancy errors)
 - rust-lang#84059 (Bump libc dependency of std to 0.2.93)
 - rust-lang#84067 (clean up example on read_to_string)
 - rust-lang#84079 (Improve test for `rustdoc::bare_urls` lint)
 - rust-lang#84094 (Remove FixedSizeArray)
 - rust-lang#84101 (rustdoc: Move crate loader to collect_intra_doc_links::early )

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1ff117e into rust-lang:master Apr 12, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 12, 2021
@jyn514 jyn514 deleted the early-pass branch April 12, 2021 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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.

Rustdoc ICE: Referencing a workspace crate's root in an intra-doc link triggers an ICE
6 participants