Fix link generation for local primitive types in rustdoc JSON output#106412
Merged
bors merged 3 commits intorust-lang:masterfrom Jan 5, 2023
Merged
Conversation
Member
|
Given that primitives are handled with the This PR should also remove the code path for rust/src/librustdoc/json/conversions.rs Lines 232 to 241 in c757267 - ItemId::Primitive(ty, krate) => Id(format!("p:{}:{}", krate.as_u32(), ty.as_sym())),
+ ItemId::Primitive(_, _) => unreachable!(),I've tested this localy, but github won't let me suggest changes for lines "to far" from the changed lines. @rustbot author |
Member
Author
|
|
Member
Author
|
I removed the match pattern for the primitive type. |
Member
|
r=me when CI passes. |
Member
Author
|
@bors r=aDotInTheVoid |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 5, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#106391 (rustdoc: allow popover child links to work) - rust-lang#106398 (Fix a few clippy lints in libtest) - rust-lang#106412 (Fix link generation for local primitive types in rustdoc JSON output) - rust-lang#106437 (rustdoc: fix buggy JS check for absolute URL) - rust-lang#106451 (Merge borrowck permission checks) - rust-lang#106460 (Move tests) - rust-lang#106461 (docs: fix broken link "search bar") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
JohnTitor
pushed a commit
to JohnTitor/rust
that referenced
this pull request
Jan 11, 2023
…, r=notriddle Remove unneeded ItemId::Primitive variant As I mentioned [here](rust-lang#106412 (comment)), I wondered if `ItemId::Primitive` was actually used for anything. Apparently, it seems so because removing it led to no changes as far as I and tests could see. r? `@notriddle`
This file contains hidden or 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
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.
Fixes #104064.
As mentioned in the issue, I'm not super happy about this fix which is more a hack rather than a sound-proof solution. However I couldn't find a better way to fix it.
r? @aDotInTheVoid