Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 15 commits October 21, 2018 18:28
…tems, r=QuietMisdreavus

Hide default impls items

Follow up of rust-lang#51885.
Fixes rust-lang#54025.

cc @Mark-Simulacrum

r? @QuietMisdreavus

And screenshots of course:

<img width="1440" alt="screen shot 2018-09-12 at 23 30 35" src="https://user-images.githubusercontent.com/3050060/45454424-1ff8d500-b6e4-11e8-9257-030322495d58.png">

<img width="1440" alt="screen shot 2018-09-12 at 23 30 42" src="https://user-images.githubusercontent.com/3050060/45454431-2424f280-b6e4-11e8-8d65-db0d85ac18f0.png">
…chton

Make `-Z ls` list the actual filename of external dependencies

The hash is pointless for external consumers - extra_filename is the thing that actually gets used, per https://github.com/rust-lang/rust/blob/ca2639e/src/librustc_metadata/locator.rs#L312-L313
…ikomatsakis

add test for deriving Debug on uninhabited enum

Adds a test to close rust-lang#38885.
test that rustdoc doesn't overflow on a big enum

Adds a test to close rust-lang#25295. The test case depended on `enum_primitive` so I just basically pulled its source into an auxiliary file, is that the right way to do it?
publish-toolstate: ping maintainers when a tool builds again

And add @Xanewok as an RLS maintainer

r? @kennytm

Motivation is that I see when the RLS gets broken, but have to poll the website to see when it is fixed, I'd prefer to get pinged.
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=5

@bors
Copy link
Collaborator

bors commented Nov 3, 2018

📌 Commit 723edf7 has been approved by GuillaumeGomez

@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 Nov 3, 2018
@bors
Copy link
Collaborator

bors commented Nov 3, 2018

⌛ Testing commit 723edf7 with merge 3d28ee3...

bors added a commit that referenced this pull request Nov 3, 2018
Rollup of 5 pull requests

Successful merges:

 - #54162 (Hide default impls items)
 - #55555 (Make `-Z ls` list the actual filename of external dependencies)
 - #55567 (add test for deriving Debug on uninhabited enum)
 - #55568 (test that rustdoc doesn't overflow on a big enum)
 - #55598 (publish-toolstate: ping maintainers when a tool builds again)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Nov 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 3d28ee3 to master...

@bors bors merged commit 723edf7 into rust-lang:master Nov 3, 2018
@GuillaumeGomez GuillaumeGomez deleted the rollup branch November 4, 2018 11:32
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants