Merge idents when generating source content #83992
Merged
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
GuillaumeGomez
added
T-rustdoc
|
r? @jyn514 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
merge-idents
branch
from
bfa7d82
to
89063a1
Compare
GuillaumeGomez
force-pushed
the
merge-idents
branch
from
89063a1
to
e2708b4
Compare
notriddle
reviewed
Apr 8, 2021
| } | ||
|
|
||
| /// Concatenate colons and idents as one when possible. | ||
| fn get_full_ident_path(&mut self) -> Vec<(TokenKind, usize, usize)> { |
There was a problem hiding this comment.
How about ArrayVec? librustdoc already depends on it, and these Vecs have exactly zero, one, or two items in them.
There was a problem hiding this comment.
Actually just gave it a try, no difference and it's actually not great in case we have less than 2 elements. Keeping it as is for the moment. If you want to give it another try later on, don't hesitate!
notriddle
approved these changes
Apr 8, 2021
|
Thanks @notriddle! @bors: r=notriddle |
|
📌 Commit e2708b4 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 8, 2021
Rollup of 6 pull requests Successful merges: - rust-lang#80733 (Improve links in inline code in `core::pin`.) - rust-lang#81764 (Stabilize `rustdoc::bare_urls` lint) - rust-lang#81938 (Stabilize `peekable_peek_mut`) - rust-lang#83980 (Fix outdated crate names in compiler docs) - rust-lang#83992 (Merge idents when generating source content) - rust-lang#84001 (Update Clippy) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
The idea here is to not have a span for each part of a path. Currently, for
a::b::cwe generate<span>a</span>::<span>b</span>::<span>c</span>, with this change, we will generate<span>a::b::c</span>.A nice "side-effect" is that it reduces the size of the output HTML too. :)
cc @notriddle