Uh oh!
There was an error while loading. Please reload this page.
Rollup of 4 pull requests - #64804
Conversation
this is necessary for never-type stabilization
The non-global context was removed; there's only one context now. This is a noop method that only serves to confuse readers -- remove it.
There's no longer two distinct gcx and tcx lifetimes which made this necessary (or, at least, the code compiles -- it's possible we got better at normalizing, but that seems unlikely).
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
Remove stray references to the old global tcx
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
commented
Sep 26, 2019
@bors r+ p=4 rollup=never |
bors
commented
Sep 26, 2019
📌 Commit e9843f9 has been approved by |
bors
commented
Sep 26, 2019
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
commented
Sep 26, 2019
☔ The latest upstream changes (presumably #64513) made this pull request unmergeable. Please resolve the merge conflicts. |
Successful merges:
impl<T> From<!> for T#62661 (reserveimpl<T> From<!> for T)Failed merges:
r? @ghost