Skip to content
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

Rollup of 9 pull requests #48806

Merged
merged 42 commits into from
Mar 8, 2018
Merged

Rollup of 9 pull requests #48806

merged 42 commits into from
Mar 8, 2018

Conversation

scottmcm and others added 25 commits February 27, 2018 10:31
This removes the last dependency on rayon 0.9
Removes the walkdir 1.0 and same-file 0.1 dependencies
Now begins the saga of fixing compilation errors on other platforms...
This pulls in the rest of LLVM's `release_60` branch (the actual 6.0.0 release)
and also pulls in a cherry-pick to...

Closes rust-lang#48226
…fix, r=QuietMisdreavus

Add resource-suffix option for rustdoc

Alternative version of rust-lang#48442.

cc @onur

r? @QuietMisdreavus
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @dtolnay

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

Added in #48669 and #48710

@bors: r+ p=100

@bors
Copy link
Collaborator

bors commented Mar 7, 2018

📌 Commit 9b6f99b has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Mar 7, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2018
@alexcrichton
Copy link
Member Author

@bors: retry

good ol' network issues

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

bors commented Mar 7, 2018

⌛ Testing commit 7c05044 with merge 0742c79ba4892b9552ae0e4359832c4a488f502f...

@bors
Copy link
Collaborator

bors commented Mar 7, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2018
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 7, 2018

📌 Commit 16cc9ce has been approved by alexcrichton

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

bors commented Mar 7, 2018

⌛ Testing commit 16cc9ce with merge 5430c0c...

bors added a commit that referenced this pull request Mar 7, 2018
Rollup of 9 pull requests

- Successful merges: #48511, #48549, #48618, #48624, #48651, #48698, #48778, #48787, #48802
- Failed merges: #48669, #48710
@alexcrichton
Copy link
Member Author

Argh I mixed up the ordering so the attempt to split the AppVeyor builder didn't actually split anything. As a result we're about to time out

That being said everything else passed, so I'm going to merge manually if this times out.

# for free to join this conversation on GitHub. Already have an account? # 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.