---

yaml
---
r: 2700
b: refs/heads/master
c: 7b4eec2
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1b440baaaa2c35f2c32939c44451f25cbe92e3a
+refs/heads/master: 7b4eec215ccee45fc4a2c23bcb127951ae5250af

trunk/src/test/compile-fail/bad-bang-ann-2.rs

@@ -0,0 +1,12 @@
+// -*- rust -*-
+// xfail-stage0
+// Tests that a function with a ! annotation always actually fails
+// error-pattern: some control paths may return
+
+fn bad_bang(uint i) -> ! {
+  log 3;
+}
+
+fn main() {
+  bad_bang(5u);
+}

trunk/src/test/compile-fail/bad-bang-ann-3.rs

@@ -0,0 +1,12 @@
+// -*- rust -*-
+// xfail-stage0
+// Tests that a function with a ! annotation always actually fails
+// error-pattern: some control paths may return
+
+fn bad_bang(uint i) -> ! {
+  ret 7u;
+}
+
+fn main() {
+  bad_bang(5u);
+}

trunk/src/test/compile-fail/bad-bang-ann.rs

@@ -0,0 +1,16 @@
+// -*- rust -*-
+// xfail-stage0
+// Tests that a function with a ! annotation always actually fails
+// error-pattern: may return to the caller
+
+fn bad_bang(uint i) -> ! {
+  if (i < 0u) {
+  }
+  else {
+    fail;
+  }
+}
+
+fn main() {
+  bad_bang(5u);
+}

trunk/src/test/run-pass/ret-bang.rs

@@ -0,0 +1,18 @@
+// -*- rust -*-
+fn my_err(str s) -> ! {
+  log_err s;
+  fail;
+}
+
+fn okay(uint i) -> int {
+  if (i == 3u) {
+    my_err("I don't like three");
+  }
+  else {
+    ret 42;
+  }
+}
+
+fn main() {
+  okay(4u);
+}