]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #36029 - KiChjang:issue-12033, r=arielb1
authorbors <bors@rust-lang.org>
Sun, 28 Aug 2016 20:16:47 +0000 (13:16 -0700)
committerGitHub <noreply@github.com>
Sun, 28 Aug 2016 20:16:47 +0000 (13:16 -0700)
Fix lifetime rules for 'if' conditions

Fixes #12033.

Changes the temporary scope rules to make the condition of an if-then-else a terminating scope. This is a [breaking-change].


Trivial merge