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.

Sign up for GitHub

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

Jump to bottom

Remove special-casing of never primitive in rustdoc-json-types #89669

Merged
merged 1 commit into from
Oct 9, 2021
Merged

Remove special-casing of never primitive in rustdoc-json-types #89669

merged 1 commit into from
Oct 9, 2021

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Oct 8, 2021

@rust-highfive
Copy link
Collaborator

rustdoc-json-types is a public (although nightly-only) API. Consider changing src/librustdoc/json/conversions.rs instead; otherwise, make sure you update format_version.

cc @CraftSpider,@aDotInTheVoid

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2021
jyn514
jyn514 approved these changes Oct 8, 2021
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 8, 2021

📌 Commit 4891aaf has been approved by GuillaumeGomez

@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 Oct 8, 2021
@GuillaumeGomez
Copy link
Member

@bors: rollup

@GuillaumeGomez GuillaumeGomez mentioned this pull request Oct 8, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2021
@bors
Auto merge of rust-lang#89683 - GuillaumeGomez:rollup-q2mjd9m, r=Guil…
f875143 
…laumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#86506 (Don't normalize xform_ret_ty during method candidate assembly )
 - rust-lang#89538 (Make rustdoc not highlight `->` and `=>` as operators)
 - rust-lang#89649 (clippy::complexity fixes)
 - rust-lang#89668 (Cfg hide more conditions for core and alloc)
 - rust-lang#89669 (Remove special-casing of never primitive in rustdoc-json-types)
 - rust-lang#89672 (Remove unwrap_or! macro)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4adc8ea into rust-lang:master Oct 9, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 9, 2021
@Urgau Urgau deleted the json-remove-type-never branch May 5, 2023 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

JSON format should be cleaned up to use Type::Primitive("never") instead of special-casing
6 participants
@Urgau @rust-highfive @GuillaumeGomez @bors @jyn514 @rustbot