Skip to content

Conversation

camelid
Copy link
Member

@camelid camelid commented Jan 29, 2021

This makes it clear that it's an implementation detail of display_fn
and shouldn't be used elsewhere, and it enforces in the compiler that no
one else can use it.

r? @GuillaumeGomez

@camelid camelid added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 29, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 29, 2021
@camelid
Copy link
Member Author

camelid commented Jan 29, 2021

Guillaume, I've been assigning you on a lot of PRs recently since Joshua is on
break. Let me know what I can do to help you review these changes! Hopefully
each PR is small enough that it shouldn't be too much, but let me know :)

@GuillaumeGomez
Copy link
Member

Guillaume, I've been assigning you on a lot of PRs recently since Joshua is on
break. Let me know what I can do to help you review these changes! Hopefully
each PR is small enough that it shouldn't be too much, but let me know :)

It's fine, I have been assigning you on a few of mine as (if you could look at #80883 please 😛 ) and @bugadani is helping me reviewing (thank you too!).

@bugadani
Copy link
Contributor

@bugadani is helping me reviewing (thank you too!).

Minor things only, though and I don't have much time for that either :/

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 29, 2021

It's completely fine. A bit of time from a few people is still very helpful! :)

@camelid
Copy link
Member Author

camelid commented Jan 29, 2021

Since there seems to be consensus that it's better with the Cell, I think I will drop the Cell-related changes and just keep the change of moving the struct into display_fn.

This makes it clear that it's an implementation detail of `display_fn`
and shouldn't be used elsewhere, and it enforces in the compiler that no
one else can use it.
@camelid camelid force-pushed the rustdoc-display_fn-remove-cell branch from e6680f2 to c34faad Compare January 29, 2021 20:20
@camelid camelid changed the title rustdoc: Remove the usage of Cell and Option in display_fn rustdoc: Move display_fn struct inside display_fn Jan 29, 2021
@jyn514
Copy link
Member

jyn514 commented Feb 4, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 4, 2021

📌 Commit c34faad has been approved by jyn514

@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 Feb 4, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 4, 2021
…ell, r=jyn514

rustdoc: Move `display_fn` struct inside `display_fn`

This makes it clear that it's an implementation detail of `display_fn`
and shouldn't be used elsewhere, and it enforces in the compiler that no
one else can use it.

r? `@GuillaumeGomez`
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 4, 2021
…ell, r=jyn514

rustdoc: Move `display_fn` struct inside `display_fn`

This makes it clear that it's an implementation detail of `display_fn`
and shouldn't be used elsewhere, and it enforces in the compiler that no
one else can use it.

r? ``@GuillaumeGomez``
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 5, 2021
…ell, r=jyn514

rustdoc: Move `display_fn` struct inside `display_fn`

This makes it clear that it's an implementation detail of `display_fn`
and shouldn't be used elsewhere, and it enforces in the compiler that no
one else can use it.

r? ```@GuillaumeGomez```
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2021
Rollup of 15 pull requests

Successful merges:

 - rust-lang#79554 (Generic associated types in trait paths)
 - rust-lang#80726 (relax adt unsizing requirements)
 - rust-lang#81307 (Handle `Span`s for byte and raw strings and add more detail )
 - rust-lang#81318 (rustdoc-json: Fix has_body)
 - rust-lang#81456 (Make remote-test-server easier to use with new targets)
 - rust-lang#81497 (rustdoc: Move `display_fn` struct inside `display_fn`)
 - rust-lang#81500 (Remove struct_type from union output)
 - rust-lang#81542 (Expose correct symlink API on WASI)
 - rust-lang#81676 (Add more information to the error code for 'crate not found')
 - rust-lang#81682 (Add additional bitset benchmarks)
 - rust-lang#81730 (Make `Allocator` object-safe)
 - rust-lang#81763 (Cleanup rustdoc pass descriptions a bit)
 - rust-lang#81767 (Update LayoutError/LayoutErr stability attributes)
 - rust-lang#81771 (Indicate change in RSS from start to end of pass in time-passes output)
 - rust-lang#81781 (Fix `install-awscli.sh` error in CI)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2451bf9 into rust-lang:master Feb 5, 2021
@rustbot rustbot added this to the 1.51.0 milestone Feb 5, 2021
@camelid camelid deleted the rustdoc-display_fn-remove-cell branch February 5, 2021 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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.

7 participants