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

rustdoc: Render private fields in tuple struct as /* private fields */ #115604

Merged
merged 2 commits into from
Sep 8, 2023

Conversation

GuillaumeGomez
Copy link
Member

Reopening of #110552. All that was missing was a test for the different cases so I added it into the second commit.

Description from the original PR:

I've gotten some feedback that the current rustdoc rendering of...

struct HasPrivateFields(_);

...is confusing, and I agree with that feedback, especially compared to the field struct case:

struct HasPrivateFields { /* private fields */ }

So this PR makes it so that when all of the fields of a tuple variant are private, just render it with the /* private fields */ comment. We can't always render it like that, for example when there's a mix of private and public fields.

cc @jsha
r? @notriddle

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 6, 2023
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 6, 2023

📌 Commit c4bb70f has been approved by notriddle

It is now in the queue for this repository.

@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 Sep 6, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 7, 2023
…e-struct, r=notriddle

rustdoc: Render private fields in tuple struct as `/* private fields */`

Reopening of rust-lang#110552. All that was missing was a test for the different cases so I added it into the second commit.

Description from the original PR:

> I've gotten some feedback that the current rustdoc rendering of...
>
> ```
> struct HasPrivateFields(_);
> ```
>
> ...is confusing, and I agree with that feedback, especially compared to the field struct case:
>
> ```
> struct HasPrivateFields { /* private fields */ }
> ```
>
> So this PR makes it so that when all of the fields of a tuple variant are private, just render it with the `/* private fields */` comment. We can't *always* render it like that, for example when there's a mix of private and public fields.

cc `@jsha`
r? `@notriddle`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 7, 2023
…e-struct, r=notriddle

rustdoc: Render private fields in tuple struct as `/* private fields */`

Reopening of rust-lang#110552. All that was missing was a test for the different cases so I added it into the second commit.

Description from the original PR:

> I've gotten some feedback that the current rustdoc rendering of...
>
> ```
> struct HasPrivateFields(_);
> ```
>
> ...is confusing, and I agree with that feedback, especially compared to the field struct case:
>
> ```
> struct HasPrivateFields { /* private fields */ }
> ```
>
> So this PR makes it so that when all of the fields of a tuple variant are private, just render it with the `/* private fields */` comment. We can't *always* render it like that, for example when there's a mix of private and public fields.

cc ``@jsha``
r? ``@notriddle``
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 7, 2023
…e-struct, r=notriddle

rustdoc: Render private fields in tuple struct as `/* private fields */`

Reopening of rust-lang#110552. All that was missing was a test for the different cases so I added it into the second commit.

Description from the original PR:

> I've gotten some feedback that the current rustdoc rendering of...
>
> ```
> struct HasPrivateFields(_);
> ```
>
> ...is confusing, and I agree with that feedback, especially compared to the field struct case:
>
> ```
> struct HasPrivateFields { /* private fields */ }
> ```
>
> So this PR makes it so that when all of the fields of a tuple variant are private, just render it with the `/* private fields */` comment. We can't *always* render it like that, for example when there's a mix of private and public fields.

cc ```@jsha```
r? ```@notriddle```
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2023
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115345 (MCP661: Move wasm32-wasi-preview1-threads target to Tier 2)
 - rust-lang#115604 (rustdoc: Render private fields in tuple struct as `/* private fields */`)
 - rust-lang#115624 (Print the path of a return-position impl trait in trait when `return_type_notation` is enabled)
 - rust-lang#115629 (Don't suggest dereferencing to unsized type)
 - rust-lang#115633 (Lint node for `PRIVATE_BOUNDS`/`PRIVATE_INTERFACES` is the item which names the private type)
 - rust-lang#115634 (Use `newtype_index` for `IntVid` and `FloatVid`.)
 - rust-lang#115638 (`-Cllvm-args` usability improvement)
 - rust-lang#115649 (diagnostics: add test case for trait bounds diagnostic)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 8, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#115345 (MCP661: Move wasm32-wasi-preview1-threads target to Tier 2)
 - rust-lang#115604 (rustdoc: Render private fields in tuple struct as `/* private fields */`)
 - rust-lang#115624 (Print the path of a return-position impl trait in trait when `return_type_notation` is enabled)
 - rust-lang#115629 (Don't suggest dereferencing to unsized type)
 - rust-lang#115634 (Use `newtype_index` for `IntVid` and `FloatVid`.)
 - rust-lang#115649 (diagnostics: add test case for trait bounds diagnostic)
 - rust-lang#115655 (rustdoc: remove unused ID `mainThemeStyle`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 403a18f into rust-lang:master Sep 8, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 8, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 8, 2023
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115345 (MCP661: Move wasm32-wasi-preview1-threads target to Tier 2)
 - rust-lang#115604 (rustdoc: Render private fields in tuple struct as `/* private fields */`)
 - rust-lang#115624 (Print the path of a return-position impl trait in trait when `return_type_notation` is enabled)
 - rust-lang#115629 (Don't suggest dereferencing to unsized type)
 - rust-lang#115633 (Lint node for `PRIVATE_BOUNDS`/`PRIVATE_INTERFACES` is the item which names the private type)
 - rust-lang#115634 (Use `newtype_index` for `IntVid` and `FloatVid`.)
 - rust-lang#115638 (`-Cllvm-args` usability improvement)
 - rust-lang#115649 (diagnostics: add test case for trait bounds diagnostic)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 8, 2023
Rollup merge of rust-lang#115604 - GuillaumeGomez:private-fields-tuple-struct, r=notriddle

rustdoc: Render private fields in tuple struct as `/* private fields */`

Reopening of rust-lang#110552. All that was missing was a test for the different cases so I added it into the second commit.

Description from the original PR:

> I've gotten some feedback that the current rustdoc rendering of...
>
> ```
> struct HasPrivateFields(_);
> ```
>
> ...is confusing, and I agree with that feedback, especially compared to the field struct case:
>
> ```
> struct HasPrivateFields { /* private fields */ }
> ```
>
> So this PR makes it so that when all of the fields of a tuple variant are private, just render it with the `/* private fields */` comment. We can't *always* render it like that, for example when there's a mix of private and public fields.

cc ````@jsha````
r? ````@notriddle````
@GuillaumeGomez GuillaumeGomez deleted the private-fields-tuple-struct branch September 8, 2023 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants