]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #46733 - nikomatsakis:nll-master-to-rust-master-5, r=arielb1
authorbors <bors@rust-lang.org>
Wed, 20 Dec 2017 03:58:15 +0000 (03:58 +0000)
committerbors <bors@rust-lang.org>
Wed, 20 Dec 2017 03:58:15 +0000 (03:58 +0000)
nll part 5

Next round of changes from the nll-master branch.

Extensions:

- we now propagate ty-region-outlives constraints out of closures and into their creator when necessary
- we fix a few ICEs that can occur by doing liveness analysis (and the resulting normalization) during type-checking
- we handle the implicit region bound that assumes that each type `T` outlives the fn body
- we handle normalization of inputs/outputs in fn signatures

Not included in this PR (will come next):

- handling `impl Trait`
- tracking causal information
- extended errors

r? @arielb1

1  2 
src/librustc/mir/mod.rs
src/librustc/ty/maps/mod.rs
src/librustc/ty/mod.rs
src/librustc/ty/util.rs
src/librustc_mir/borrow_check/error_reporting.rs
src/librustdoc/clean/mod.rs
src/test/ui/nll/capture-ref-in-struct.stderr
src/test/ui/nll/closure-requirements/escape-argument.stderr
src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr
src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr
src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge