Skip to content

Rollup of 4 pull requests - #64800

Closed
Centril wants to merge 33 commits into
rust-lang:masterfrom
Centril:rollup-euzm6ix
Closed

Rollup of 4 pull requests#64800
Centril wants to merge 33 commits into
rust-lang:masterfrom
Centril:rollup-euzm6ix

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

arielb1and others added 30 commits September 24, 2019 21:11
this is necessary for never-type stabilization
Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.
Additionally, the zircon syscall structs were out of date, causing us to
see bogus return codes.
reserve `impl<T> From<!> for T`
this is necessary for never-type stabilization.
cc rust-lang#57012rust-lang#35121
I think we wanted a crater run for this @nikomatsakis?
r? @nikomatsakis
…hewjasper
Rust 2015: No longer downgrade NLL errors
As per decision on a language team meeting as described in rust-lang#63565 (comment), in Rust 2015, we refuse to downgrade NLL errors, that AST borrowck accepts, into warnings and keep them as hard errors.
The remaining work to throw out AST borrowck and adjust some tests still remains after this PR.
Fixesrust-lang#38899Fixesrust-lang#53432Fixesrust-lang#45157Fixesrust-lang#31567Fixesrust-lang#27868Fixesrust-lang#47366
r? @matthewjasper
Fix ExitStatus on Fuchsia
Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.
Additionally, the zircon syscall structs were out of date, causing us to
see bogus exit codes.
r? @cramertj@alexcrichton
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4 rollup=never

@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2c7796a has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 26, 2019
@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2c7796a with merge fb78acac3713e20dbe9b57b86ee17684014e9ab5...

@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-msvc-cargo of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-26T02:45:21.0854883Z do so (now or later) by using -b with the checkout command again. Example:
2019-09-26T02:45:21.0854981Z 2019-09-26T02:45:21.0855062Z git checkout -b <new-branch-name>
2019-09-26T02:45:21.0855112Z 2019-09-26T02:45:21.0855374Z HEAD is now at fb78acac3 Auto merge of #64800 - Centril:rollup-euzm6ix, r=Centril
2019-09-26T02:45:21.1256975Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-09-26T02:45:21.1390081Z ==============================================================================
2019-09-26T02:45:21.1390199Z Task : Bash
2019-09-26T02:45:21.1390273Z Description : Run a Bash script on macOS, Linux, or Windows
---
2019-09-26T04:26:51.7555170Z == clock drift check ==
2019-09-26T04:26:51.8244705Z local time: Thu Sep 26 04:26:51 CUT 2019
2019-09-26T04:26:52.0442961Z network time: Thu, 26 Sep 2019 04:26:52 GMT
2019-09-26T04:26:52.0466694Z == end clock drift check ==
2019-09-26T04:26:52.5512263Z ##[error]Bash exited with code '1'.
2019-09-26T04:26:52.6168613Z ##[section]Starting: Upload CPU usage statistics
2019-09-26T04:26:52.7161851Z ==============================================================================
2019-09-26T04:26:52.7161984Z Task : Bash
2019-09-26T04:26:52.7162069Z Description : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@borsbors 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 Sep 26, 2019
@CentrilCentril closed this Sep 26, 2019
@Centril
Centril deleted the rollup-euzm6ix branch September 26, 2019 04:40
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Centril@bors@rust-highfive@arielb1@nikomatsakis@varkor@tmandry