]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #47802 - bobtwinkles:loop_false_edge, r=nikomatsakis
authorbors <bors@rust-lang.org>
Fri, 9 Feb 2018 13:04:17 +0000 (13:04 +0000)
committerbors <bors@rust-lang.org>
Fri, 9 Feb 2018 13:04:17 +0000 (13:04 +0000)
[NLL] Add false edges out of infinite loops

Resolves #46036 by adding a `cleanup` member to the `FalseEdges` terminator kind. There's also a small doc fix to one of the other comments in `into.rs` which I can pull out in to another PR if desired =)

This PR should pass CI but the test suite has been relatively unstable on my system so I'm not 100% sure.

r? @nikomatsakis

1  2 
src/librustc/ich/impls_mir.rs
src/librustc/mir/mod.rs
src/librustc/mir/visit.rs
src/librustc_mir/borrow_check/mod.rs
src/librustc_mir/dataflow/impls/borrows.rs
src/librustc_mir/transform/inline.rs
src/librustc_mir/transform/qualify_consts.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge