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

[rustdoc-json] Make enum tuple variants match tuple structs #93529

Closed
wants to merge 2 commits into from
Closed

[rustdoc-json] Make enum tuple variants match tuple structs #93529

wants to merge 2 commits into from

Conversation

CraftSpider
Copy link
Contributor

No more free-floating struct_field members without references
Fixes #92945

@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

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 31, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Jan 31, 2022
@CraftSpider CraftSpider added the A-rustdoc-json Area: Rustdoc JSON backend label Jan 31, 2022
@Mark-Simulacrum
Copy link
Member

r? rust-lang/rustdoc

@rust-highfive rust-highfive assigned jsha and unassigned Mark-Simulacrum Feb 1, 2022
@petrochenkov
Copy link
Contributor

@CraftSpider
Meta: could you prefix the PR names with the code area that it touches, like "rustdoc: Make enum tuple variants match tuple structs".
Without that the PR name looks like some nonsensical language change that affects how tuple variants behave in match expressions.

@CraftSpider CraftSpider changed the title Make enum tuple variants match tuple structs [rustdoc-json] Make enum tuple variants match tuple structs Feb 1, 2022
@CraftSpider
Copy link
Contributor Author

Whoops, sorry. Relevant prefix added

@Enselic Enselic mentioned this pull request Feb 1, 2022
Closed
@aDotInTheVoid
Copy link
Member

Could you add a test for this?

@CraftSpider
Copy link
Contributor Author

I'll update the enum tuple variant test to check that the struct_field IDs are in the child item list, is that good? The existence of the fields and such is already tested.

@bors
Copy link
Contributor

bors commented Mar 4, 2022

☔ The latest upstream changes (presumably #94009) made this pull request unmergeable. Please resolve the merge conflicts.

@CraftSpider
Copy link
Contributor Author

I'll fix this as soon as I have some free time, and update the FORMAT_VERSION

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2022
@JohnCSimon
Copy link
Member

assigning back to author
@rustbot label: +S-waiting-on-author -S-waiting-on-review

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2022
@Dylan-DPC
Copy link
Member

@CraftSpider any updates on this?

@CraftSpider CraftSpider force-pushed the rustdoc-tuple-variant-consistency branch from 7927dfc to 45e05ec Compare May 17, 2022 19:35
@bors
Copy link
Contributor

bors commented Jun 2, 2022

☔ The latest upstream changes (presumably #97654) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnCSimon
Copy link
Member

@CraftSpider
Ping from triage: I'm closing this due to inactivity, Please reopen when you are ready to continue with this.
Note: if you do please open the PR BEFORE you push to it, else you won't be able to reopen - this is a quirk of github.
Thanks for your contribution.

@rustbot label: +S-inactive

@JohnCSimon JohnCSimon closed this Jul 3, 2022
@rustbot rustbot added the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Jul 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jsha jsha

Labels
A-rustdoc-json Area: Rustdoc JSON backend S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[rustdoc-json] Free-floating struct_field items with enum tuple struct variants
10 participants
@CraftSpider @rust-highfive @Mark-Simulacrum @petrochenkov @aDotInTheVoid @bors @JohnCSimon @Dylan-DPC @jsha @rustbot