Fix rustdoc json primitive handling#98195
Merged
bors merged 2 commits intorust-lang:masterfrom Jun 18, 2022
Merged
Conversation
Contributor
|
r? @notriddle (rust-highfive has picked a reviewer for you, use r? to override) |
Contributor
|
I see that this stops it from crashing, but I don’t understand why the primitive type is being duplicated in the index. The existing comment only explains why blanket impls can be safely ignored, not why primitive docs can. If you can figure out what’s actually causing this, can you add a comment explaining it? |
Member
Author
|
The whole explanation is here. But what causes the conflict in here is that we document private items too. So the module and the primitive types have a same ID, generating the conflict. |
notriddle
reviewed
Jun 17, 2022
b8bf98b to
7cdf126
Compare
Member
Author
|
Updated. |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 7cdf126 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#97803 (Impl Termination for Infallible and then make the Result impls of Termination more generic) - rust-lang#97828 (Allow configuring where artifacts are downloaded from) - rust-lang#98150 (Emscripten target: replace -g4 with -g, and -g3 with --profiling-funcs) - rust-lang#98195 (Fix rustdoc json primitive handling) - rust-lang#98205 (Remove a possible unnecessary assignment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
5 participants
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 #98006.
cc @matthiaskrgr