---

yaml
---
r: 134206
b: refs/heads/auto
c: e5bbbbe
h: refs/heads/master
v: v3

Author: ftxqxd

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b220db03bd334b2e74c4dfd62ed1318941b82a3c
+refs/heads/auto: e5bbbbe274dff5d420f256b58ff107e619ddf86d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/compile-fail/closure-that-fails.rs

@@ -13,5 +13,8 @@ fn foo(f: || -> !) {}
 fn main() {
     // Type inference didn't use to be able to handle this:
     foo(|| fail!());
+    foo(|| -> ! fail!());
     foo(|| 22); //~ ERROR mismatched types
+    foo(|| -> ! 22); //~ ERROR mismatched types
+    let x = || -> ! 1; //~ ERROR mismatched types
 }

branches/auto/src/test/compile-fail/dead-code-closure-bang.rs

@@ -0,0 +1,17 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![deny(unreachable_code)]
+
+fn main() {
+    let x: || -> ! = || fail!();
+    x();
+    println!("Foo bar"); //~ ERROR: unreachable statement
+}

branches/auto/src/test/run-pass/closure-return-bang.rs

@@ -0,0 +1,20 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![allow(dead_code)]
+
+fn f(x: || -> !) -> ! {
+    x();
+}
+
+fn main() {
+    let x: || -> ! = || fail!();
+    let _y: || -> ! = || x();
+}