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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #64800

Closed
wants to merge 33 commits into from
Closed

Rollup of 4 pull requests #64800

wants to merge 33 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 26, 2019

Successful merges:

Failed merges:

r? @ghost

arielb1 and others added 30 commits September 24, 2019 21:11
@arielb1
reserve impl<T> From<!> for T
5d79e8c 
this is necessary for never-type stabilization
@arielb1
improve and add tests
9a94ecd
@arielb1
resolve the rustc_reservation_impl attribute in 1 place
1ec7ae1
@arielb1
improve comments
b5665e8
@arielb1
add error message for case
9196b2d
@arielb1
add test for lattice specialization
d7eb562
@arielb1
improve comment
5de1faf
@nikomatsakis @arielb1
cite reservation impls tracking issue
68fd593
@nikomatsakis @arielb1
remove outdated fixme
b40a64d
@nikomatsakis @arielb1
nit: update text to avoid "lattice specialization" term
da60c53
@nikomatsakis @arielb1
nit: update error text to cite tracking issue
167ab04
@nikomatsakis @arielb1
add a rustdoc comment to the reservation impl
99dc545
@varkor
Rename non-TyS uses of sty
2808a46
@varkor
Rename sty to kind
e2e0f9a
@varkor
Rename surviving uses of sty
bd5adc5
@varkor
Fix rebase
93df1bb
@Centril
Refuse downgrading NLL errors on Rust 2015.
b6fc4b1
@Centril
rustc_mir: remove dead code for downgrading errors.
0c7c98f
@Centril
Adjust & --bless tests due to no longer downgrading NLL errors on 2015.
b9eaad2
@Centril
add test for rust-lang#53432.
419ed8b
@Centril
remove feature(nll) from rust-lang#45157 test.
b10b8a7
@Centril
remove feature(nll) from rust-lang#31567 test.
947c10c
@Centril
remove feature(nll) from rust-lang#27868 test.
af26372
@Centril
remove feature(nll) in more cases.
86481e1
@Centril
rm "src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.s…
9f3e61b 
…tderr"
@Centril
issue-rust-lang#45696-scribble...: remove outdated comment.
4503ad4
@arielb1
address rebase damage
e70724c
@varkor
Fix fallout
bc2a373
@tmandry
Fix ExitStatus on Fuchsia
80db06d 
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.
@Centril
Rollup merge of rust-lang#62661 - arielb1:never-reserve, r=nikomatsakis
06f6b8a 
reserve `impl<T> From<!> for T`

this is necessary for never-type stabilization.

cc rust-lang#57012 rust-lang#35121

I think we wanted a crater run for this @nikomatsakis?

r? @nikomatsakis
@Centril
Rollup merge of rust-lang#64221 - Centril:nll-no-migrate-2015, r=matt…
33ef5dd 
…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.

Fixes rust-lang#38899
Fixes rust-lang#53432
Fixes rust-lang#45157
Fixes rust-lang#31567
Fixes rust-lang#27868
Fixes rust-lang#47366

r? @matthewjasper
@Centril
Rollup merge of rust-lang#64513 - varkor:sty-begone, r=eddyb
64e8527 
Rename `TyS.sty` to `TyS.kind`

Fixes rust-lang#64353.

r? @eddyb
@Centril
Rollup merge of rust-lang#64787 - tmandry:fuchsia-exitstatus, r=cramertj
2c7796a 
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
Contributor Author

Centril commented Sep 26, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Sep 26, 2019

📌 Commit 2c7796a has been approved by Centril

@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 26, 2019
@bors
Copy link
Contributor

bors commented Sep 26, 2019

⌛ Testing commit 2c7796a with merge fb78acac3713e20dbe9b57b86ee17684014e9ab5...

@bors
Copy link
Contributor

bors commented Sep 26, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

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)

@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 Sep 26, 2019
@Centril Centril closed this Sep 26, 2019
@Centril Centril deleted the rollup-euzm6ix branch September 26, 2019 04:40
@Centril Centril mentioned this pull request Sep 26, 2019
Merged
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Centril @bors @rust-highfive @arielb1 @nikomatsakis @varkor @tmandry