Rollup of 4 pull requests #64804

Centril · 2019-09-26T06:51:18Z

Successful merges:

reserve impl<T> From<!> for T #62661 (reserve impl<T> From<!> for T)
Rust 2015: No longer downgrade NLL errors #64221 ( Rust 2015: No longer downgrade NLL errors)
Remove stray references to the old global tcx #64781 (Remove stray references to the old global tcx)
Fix ExitStatus on Fuchsia #64787 (Fix ExitStatus on Fuchsia)

Failed merges:

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.

…tderr"

@nikomatsakis

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

@matthewjasper

…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

Remove stray references to the old global tcx

@cramertj

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 · 2019-09-26T06:51:54Z

@bors r+ p=4 rollup=never

bors · 2019-09-26T06:51:55Z

📌 Commit e9843f9 has been approved by Centril

bors · 2019-09-26T08:42:23Z

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-3gv3i7x (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-3gv3i7x --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing src/tools/cargotest/lockfiles/iron-Cargo.lock
Removing src/test/ui/thread-local-in-ctfe.nll.stderr
Removing src/test/ui/pattern/pattern-bindings-after-at.nll.stderr
Removing src/test/ui/issues/issue-49824.nll.stderr
Removing src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr
Auto-merging src/test/ui/issues/issue-40510-3.stderr
Removing src/test/ui/issues/issue-40510-3.nll.stderr
Auto-merging src/test/ui/issues/issue-40510-1.stderr
Removing src/test/ui/issues/issue-40510-1.nll.stderr
Removing src/test/ui/consts/min_const_fn/min_const_fn_dyn.nll.stderr
Removing src/test/ui/consts/min_const_fn/min_const_fn.nll.stderr
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.rs
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr
Removing src/test/ui/borrowck/borrowck-describe-lvalue.nll.stderr
Removing src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr
Auto-merging src/librustdoc/clean/mod.rs
Auto-merging src/librustc_typeck/collect.rs
Auto-merging src/librustc_typeck/coherence/builtin.rs
Auto-merging src/librustc_typeck/check/wfcheck.rs
Auto-merging src/librustc_typeck/check/expr.rs
Auto-merging src/librustc_typeck/astconv.rs
Auto-merging src/librustc_traits/chalk_context/mod.rs
Auto-merging src/librustc_mir/shim.rs
Auto-merging src/librustc_mir/hair/cx/expr.rs
Auto-merging src/librustc_mir/dataflow/drop_flag_effects.rs
Auto-merging src/librustc_mir/borrow_check/nll/universal_regions.rs
Auto-merging src/librustc_mir/borrow_check/nll/type_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/conflict_errors.rs
Auto-merging src/librustc_metadata/encoder.rs
Auto-merging src/librustc/ty/print/pretty.rs
Auto-merging src/librustc/ty/mod.rs
Auto-merging src/librustc/ty/layout.rs
Auto-merging src/librustc/ty/instance.rs
Auto-merging src/librustc/ty/error.rs
Auto-merging src/librustc/ty/context.rs
Auto-merging src/librustc/traits/specialize/specialization_graph.rs
Auto-merging src/librustc/traits/select.rs
Auto-merging src/librustc/traits/query/normalize.rs
Auto-merging src/librustc/traits/query/dropck_outlives.rs
Auto-merging src/librustc/traits/fulfill.rs
Auto-merging src/librustc/traits/error_reporting.rs
Auto-merging src/librustc/traits/auto_trait.rs
Auto-merging src/librustc/middle/mem_categorization.rs
Auto-merging src/librustc/middle/intrinsicck.rs
CONFLICT (content): Merge conflict in src/librustc/middle/intrinsicck.rs
Auto-merging src/librustc/infer/opaque_types/mod.rs
Auto-merging src/librustc/infer/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-09-26T08:55:29Z

☔ The latest upstream changes (presumably #64513) made this pull request unmergeable. Please resolve the merge conflicts.

arielb1 and others added 30 commits September 24, 2019 21:11

reserve impl<T> From<!> for T

5d79e8c

this is necessary for never-type stabilization

improve and add tests

9a94ecd

resolve the rustc_reservation_impl attribute in 1 place

1ec7ae1

improve comments

b5665e8

add error message for case

9196b2d

add test for lattice specialization

d7eb562

improve comment

5de1faf

cite reservation impls tracking issue

68fd593

remove outdated fixme

b40a64d

nit: update text to avoid "lattice specialization" term

da60c53

nit: update error text to cite tracking issue

167ab04

add a rustdoc comment to the reservation impl

99dc545

Remove global_tcx from TyCtxt

40fad74

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.

Remove lift_to_global

5cebfa5

address rebase damage

e70724c

Remove stray uses of gcx name

9f63a3a

Remove shrink_to_tcx_lifetime

4469bdd

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).

Refuse downgrading NLL errors on Rust 2015.

ece6f83

rustc_mir: remove dead code for downgrading errors.

aff9c83

Adjust & --bless tests due to no longer downgrading NLL errors on 2015.

6ec9b3a

add test for rust-lang#53432.

487f8ab

remove feature(nll) from rust-lang#45157 test.

2fb0bba

remove feature(nll) from rust-lang#31567 test.

1256613

remove feature(nll) from rust-lang#27868 test.

b638aa1

remove feature(nll) in more cases.

2b80ed9

rm "src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.s…

dfdd4d7

…tderr"

issue-rust-lang#45696-scribble...: remove outdated comment.

ce8c5d2

cargotest: bump webrender

f8af766

cargotest: bump iron

9a2cc54

Centril added 4 commits September 26, 2019 08:51

Rollup merge of rust-lang#62661 - arielb1:never-reserve, r=nikomatsakis

53d1fca

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

Rollup merge of rust-lang#64781 - Mark-Simulacrum:no-global-tcx, r=eddyb

d8406ff

Remove stray references to the old global tcx

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 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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 closed this Sep 26, 2019

Centril deleted the rollup-3gv3i7x branch September 26, 2019 15:03

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #64804

Rollup of 4 pull requests #64804

Centril commented Sep 26, 2019

Centril commented Sep 26, 2019

bors commented Sep 26, 2019

bors commented Sep 26, 2019

bors commented Sep 26, 2019

Rollup of 4 pull requests #64804

Rollup of 4 pull requests #64804

Conversation

Centril commented Sep 26, 2019

Centril commented Sep 26, 2019

bors commented Sep 26, 2019

bors commented Sep 26, 2019

bors commented Sep 26, 2019