rustdoc: Preprocess intra-doc links consistently between crate loader and link resolver #84066
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jyn514
added
T-rustdoc
This comment has been minimized.
This comment has been minimized.
rust-highfive
added
the
S-waiting-on-review
|
Line 1072 also needs to be part of the function or it will panic on that too: |
This comment has been minimized.
This comment has been minimized.
jyn514
force-pushed
the
consistent-link-strippping
branch
2 times, most recently
from
d6d3a46
to
27799b3
Compare
jyn514
changed the title
jyn514
commented
Apr 10, 2021
|
Ok, this should be ready for review. |
klensy
reviewed
Apr 11, 2021
klensy
reviewed
Apr 11, 2021
jyn514
force-pushed
the
consistent-link-strippping
branch
from
030b4b3
to
e3bd08a
Compare
Previously, rustdoc would panic on links to external crates if they were surrounded by backticks.
jyn514
force-pushed
the
consistent-link-strippping
branch
from
e3bd08a
to
47d1ed9
Compare
Manishearth
approved these changes
Apr 11, 2021
|
@bors r+ |
|
📌 Commit 47d1ed9 has been approved by |
bors
added
S-waiting-on-bors
Manishearth
reviewed
Apr 11, 2021
| @@ -892,6 +892,117 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> { | |||
| } | |||
| } | |||
|
|
|||
| crate enum PreprocessingError<'a> { | |||
| Anchor(AnchorFailure), | |||
| Disambiguator(Range<usize>, String), | |||
There was a problem hiding this comment.
nit: worth having comments on each one explaining what the error is
bors
added
S-waiting-on-author
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Apr 11, 2021
rustdoc: Move crate loader to collect_intra_doc_links::early This groups the similar code together, and also allows making most of collect_intra_doc_links private again. This builds on rust-lang#84066, but it wouldn't be too hard to base it off master if you want this to land first. Helps with rust-lang#83761. r? manishearth Fixes rust-lang#84046
|
Hmm, somehow this PR still got merged after being |
|
Ah, that makes sense. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, rustdoc would panic on links to external crates if they were
surrounded by backticks or the first path segment contained generics.
This is more extensive than the fix I suggested in #84046; it makes the preprocessing exactly the same rather than trying to duplicate only the necessary logic. This makes fixing the generics a lot easier as it turns out.
Fixes #84046.
r? @Manishearth