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

Rollup of 6 pull requests #70734

Merged
merged 17 commits into from
Apr 3, 2020
Merged

Rollup of 6 pull requests #70734

merged 17 commits into from
Apr 3, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

jumbatm and others added 17 commits April 2, 2020 22:45
Make sure we check the case where the generic operand comes first, in
case any future changes make this ordering matter.
Since rust-lang@2f62265
there has been only one invocation.
Also, fix the goofy reversed names with something clearer.
…RalfJung

Extend rust-lang#69020 test to include reversed operand order.

Make sure we still emit if a lint if the generic argument comes first. See rust-lang#70566 (comment).

r? @RalfJung
Minor cleanup in rustdoc --check-theme

Expand and remove try_something macro. Since rust-lang@2f62265 there has been only one invocation.

r? @GuillaumeGomez
Avoid `.unwrap()`s on `.span_to_snippet(...)`s

First commit fixes rust-lang#70724 and the others fix similar issues found by grepping.

r? @estebank
…ylan-DPC

Fix link in task::Wake docs

`task::Wake` was introduced in rust-lang#68700. While I was browsing the docs I noticed a link to `sync::Arc` wasn't resolving correctly. This patch fixes that. Thanks!

## Before

![Screenshot_2020-04-03 std task Wake - Rust](https://user-images.githubusercontent.com/2467194/78346384-466cb280-759f-11ea-97c8-aede186c674e.png)

## Proposed

![Screenshot_2020-04-03 alloc task Wake - Rust](https://user-images.githubusercontent.com/2467194/78349819-79657500-75a4-11ea-9282-16691ae2a5d4.png)
…=eddyb

Minor follow-up after renaming librustc(_middle)

Fixes rust-lang#70537
r? @Centril @eddyb
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Apr 3, 2020

📌 Commit 04824f3 has been approved by Dylan-DPC

@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 Apr 3, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 3, 2020
@bors
Copy link
Contributor

bors commented Apr 3, 2020

⌛ Testing commit 04824f3 with merge f6fe99c...

@bors
Copy link
Contributor

bors commented Apr 3, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing f6fe99c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2020
@bors bors merged commit f6fe99c into rust-lang:master Apr 3, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-xmncatq branch April 3, 2020 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants