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

Fix rustdoc json primitive handling #98195

Merged
merged 2 commits into from
Jun 18, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes #98006.

cc @matthiaskrgr

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-json Area: Rustdoc JSON backend labels Jun 17, 2022
@rust-highfive
Copy link
Collaborator

r? @notriddle

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2022
@notriddle
Copy link
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?

@GuillaumeGomez
Copy link
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.

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-json-primitive branch from b8bf98b to 7cdf126 Compare June 17, 2022 13:49
@GuillaumeGomez
Copy link
Member Author

Updated.

@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 17, 2022

📌 Commit 7cdf126 has been approved by notriddle

@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 Jun 17, 2022
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
@bors bors merged commit 4557ff7 into rust-lang:master Jun 18, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 18, 2022
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-json-primitive branch June 18, 2022 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend 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 json ice: assertion failure: different Item visibility (Crate vs Public)
5 participants