Skip to content

rustdoc: add method spacing to trait methods - #102447

Merged
bors merged 1 commit into
rust-lang:masterfrom
notriddle:notriddle/method-toggle
Sep 29, 2022
Merged

rustdoc: add method spacing to trait methods#102447
bors merged 1 commit into
rust-lang:masterfrom
notriddle:notriddle/method-toggle

Conversation

@notriddle

Copy link
Copy Markdown
Contributor

More cleanup for 8846c08, this time in trait layouts when things are collapsed.

This PR makes two changes to the appearance of trait pages:

  • It adds the method-toggle class to method toggles on traits, making the DOM more consistent with type pages (which already have this class).

    Before

    image

    After

    image

  • It adds a bottom margin to docblocks nested directly in the implementors list, giving it a similar appearance to if it was nested within a toggle.

    Before

    image

    After

    image

@rustbotrustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Sep 29, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jsha (or someone else) soon.

Please see the contribution instructions for more information.

@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @Folyd, @jsha

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2022
@jsha

jsha commented Sep 29, 2022

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Sep 29, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit d412bdc has been approved by jsha

It is now in the queue for this repository.

@borsbors 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 29, 2022
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Sep 29, 2022
… r=jsha
rustdoc: add method spacing to trait methods
More cleanup for 8846c08, this time in trait layouts when things are collapsed.
This PR makes two changes to the appearance of trait pages:
* It adds the `method-toggle` class to method toggles on traits, making the DOM more consistent with type pages (which already have this class).
## Before
![image](https://user-images.githubusercontent.com/1593513/192914353-ed17e1eb-df1d-480b-9998-3b5e8283b0ee.png)
## After
![image](https://user-images.githubusercontent.com/1593513/192914570-bdd0f2e1-5254-4e2e-9576-a797b82b3b3b.png)
* It adds a bottom margin to docblocks nested directly in the implementors list, giving it a similar appearance to if it was nested within a toggle.
## Before
![image](https://user-images.githubusercontent.com/1593513/192914503-1c3f39d5-690f-44ec-8f11-385302477d04.png)
## After
![image](https://user-images.githubusercontent.com/1593513/192914702-cbce4b3b-5cc6-49dc-b7f8-73be9e76791c.png)
@JohnTitor

Copy link
Copy Markdown
Member

Failed in rollup: #102448 (comment)
@bors r-

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 29, 2022
@rust-log-analyzer

This comment has been minimized.

More cleanup for 8846c08, this time in trait
layouts when things are collapsed.
@notriddle
notriddleforce-pushed the notriddle/method-toggle branch from d412bdc to 0b9b4b7CompareSeptember 29, 2022 04:11
@notriddle

Copy link
Copy Markdown
ContributorAuthor

@bors r=jsha rollup

@bors

bors commented Sep 29, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 0b9b4b7 has been approved by jsha

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 29, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 29, 2022
… r=jsha
rustdoc: add method spacing to trait methods
More cleanup for 8846c08, this time in trait layouts when things are collapsed.
This PR makes two changes to the appearance of trait pages:
* It adds the `method-toggle` class to method toggles on traits, making the DOM more consistent with type pages (which already have this class).
## Before
![image](https://user-images.githubusercontent.com/1593513/192914353-ed17e1eb-df1d-480b-9998-3b5e8283b0ee.png)
## After
![image](https://user-images.githubusercontent.com/1593513/192914570-bdd0f2e1-5254-4e2e-9576-a797b82b3b3b.png)
* It adds a bottom margin to docblocks nested directly in the implementors list, giving it a similar appearance to if it was nested within a toggle.
## Before
![image](https://user-images.githubusercontent.com/1593513/192914503-1c3f39d5-690f-44ec-8f11-385302477d04.png)
## After
![image](https://user-images.githubusercontent.com/1593513/192914702-cbce4b3b-5cc6-49dc-b7f8-73be9e76791c.png)
@notriddlenotriddle mentioned this pull request Sep 29, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2022
Rollup of 7 pull requests
Successful merges:
- rust-lang#102214 (Fix span of byte-escaped left format args brace)
- rust-lang#102426 (Don't export `__wasm_init_memory` on WebAssembly.)
- rust-lang#102437 (rustdoc: cut margin-top from first header in docblock)
- rust-lang#102442 (rustdoc: remove bad CSS font-weight on `.impl`, `.method`, etc)
- rust-lang#102447 (rustdoc: add method spacing to trait methods)
- rust-lang#102468 (tidy: make rustc dependency error less confusing)
- rust-lang#102476 (Split out the error reporting logic into a separate function)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 8a73397 into rust-lang:masterSep 29, 2022
@rustbotrustbot added this to the 1.66.0 milestone Sep 29, 2022
@notriddle
notriddle deleted the notriddle/method-toggle branch September 29, 2022 22:48
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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

@notriddle@rust-highfive@rustbot@jsha@bors@JohnTitor@rust-log-analyzer