Skip to content

Rollup of 2 pull requests #101661

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

Jump to bottom
Closed
wants to merge 5 commits into from
Closed

Rollup of 2 pull requests #101661

wants to merge 5 commits into from

Conversation

compiler-errors
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 5 commits September 10, 2022 10:18
@GuillaumeGomez
Simplify DOM for codeblocks tooltips
30168bd
@GuillaumeGomez
Update rustdoc GUI tests
8ba06d4
@ChrisDenton
Explicitly link kernel32.lib from alloc
931e851
@compiler-errors
Rollup merge of rust-lang#101613 - GuillaumeGomez:codeblock-tooltip, …
2a1db4e 
…r=notriddle

Simplify codeblock and their associated tooltip

It is based on rust-lang#101600 so it needs to wait for this one to be merged first.

This PR does two things:

 * Remove CSS class duplication by setting CSS classes such as `compile_fail` directly on the `div` wrapping both the codeblock and the tooltip.
 * Simplify DOM: no need to wrap the tooltip into a `<div>`, it can work just as well without it.

You can test it [here](https://rustdoc.crud.net/imperio/codeblock-tooltip/std/string/struct.String.html#deref).

r? `@notriddle`
@compiler-errors
Rollup merge of rust-lang#101643 - ChrisDenton:alloc-link-kernel32, r…
71dca97 
…=thomcc

Explicitly link kernel32.lib from alloc
@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. rollup A PR which is a rollup labels Sep 10, 2022
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented Sep 10, 2022

📌 Commit 71dca97 has been approved by compiler-errors

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 10, 2022
@compiler-errors
Copy link
Member Author

ok a few other prs have been r+'ed since this one, @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 10, 2022
@compiler-errors compiler-errors deleted the rollup-ujag8lz branch November 2, 2022 02:58
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@compiler-errors @bors @rustbot @GuillaumeGomez @ChrisDenton