Skip to content

Rollup of 4 pull requests #101590

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 9 commits into from
Closed

Conversation

sanxiyn
Copy link
Member

@sanxiyn sanxiyn commented Sep 8, 2022

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mkroening and others added 9 commits September 5, 2022 00:23
This was added in 51f26ac to help with the
display of an `<h3>` tag that has a `<span class='in-band'>` inside.

The way implementation lists were rendered was changed in
34bd2b8 to have `<code class='in-band'>`,
making this CSS unused.

Then it was turned into a `<div>` in 9077d54
without issue.

Finally, the header itself acquired the `in-band` class in
76a3b60.
This was added in 9077d54 to override the
style on `<div>` tags that were acting as headers. These `<div>` tags were
replaced with `<section>` tags in 32f6260,
but this CSS was probably already redundant even then (the headers had
already been replaced with real `<h3>` and `<h4>` tags in
76a3b60).
This CSS was added in 5e01ba3, and served to
override CSS right above it that set a 5px padding for several kinds of
buttons in the same toolbar.

The CSS that it overrode is still there, but now it only applies to
`#settings-menu > a`, so there's nothing to override.
Fix hermit warnings

This fixes two `unused_imprt` and one `dead_code` warning for hermit.
…list-h3-span-in-band, r=Dylan-DPC

rustdoc: remove unused CSS `#implementations-list > h3 > span.in-band`

This was added in 51f26ac to help with the display of an `<h3>` tag that has a `<span class='in-band'>` inside.

The way implementation lists were rendered was changed in 34bd2b8 to have `<code class='in-band'>`, making this CSS unused.

Then it was turned into a `<div>` in 9077d54 without issue.

Finally, the header itself acquired the `in-band` class in 76a3b60.
…-div, r=GuillaumeGomez

rustdoc: remove unused CSS `div.impl-items > div`

This was added in 9077d54 to override the style on `<div>` tags that were acting as headers. These `<div>` tags were replaced with `<section>` tags in 32f6260, but this CSS was probably already redundant even then (the headers had already been replaced with real `<h3>` and `<h4>` tags in 76a3b60).
… r=GuillaumeGomez

rustdoc: remove no-op CSS `#settings-menu { padding: 0 }`

This CSS was added in 5e01ba3, and served to override CSS right above it that set a 5px padding for several kinds of buttons in the same toolbar:

https://github.com/rust-lang/rust/blob/5e01ba36c9f1037c4cf3e7421413fc6c41f85d05/src/librustdoc/html/static/css/rustdoc.css#L1400-L1409

The CSS that it overrode is still there, but now it only applies to `#settings-menu > a`, so there's nothing to override.

https://github.com/rust-lang/rust/blob/24d69920201563f0ee7b530f1cda0f171b205cc2/src/librustdoc/html/static/css/rustdoc.css#L1445-L1454
@rustbot
Copy link
Collaborator

rustbot commented Sep 8, 2022

Error: Label rollup can only be set by Rust team members

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

@rustbot rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 8, 2022
@sanxiyn
Copy link
Member Author

sanxiyn commented Sep 8, 2022

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Sep 8, 2022

📌 Commit 23c919b has been approved by sanxiyn

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 8, 2022
@compiler-errors
Copy link
Member

is there a reason why not all 7 rollup=always PRs were rolled up in this?

@spastorino
Copy link
Member

I was going to ask the same question @compiler-errors did ask.

@compiler-errors
Copy link
Member

superseded by #101592

@bors r-

@bors bors 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 8, 2022
@sanxiyn
Copy link
Member Author

sanxiyn commented Sep 8, 2022

Okay.

@sanxiyn sanxiyn closed this Sep 8, 2022
@sanxiyn sanxiyn deleted the rollup-l5e6jql branch September 8, 2022 22:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. 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