Merge branch 'master' of github.com:graydon/rust

1 files changed, 17 insertions, 0 deletions

diff --git a/src/test/compile-fail/alt-join.rs b/src/test/compile-fail/alt-join.rs
new file mode 100644
index 00000000000..bbd4ac5c73a
--- /dev/null
+++ b/src/test/compile-fail/alt-join.rs
@@ -0,0 +1,17 @@
+// error-pattern:Unsatisfied precondition constraint
+// a good test that we merge paths correctly in the presence of a
+// variable that's used before it's declared
+// should be rejected by typestate because we use x without initializing it
+
+fn my_fail() -> ! { fail; }
+
+fn main() {
+
+    alt (true) {
+      false { my_fail(); }
+      true {}
+    }
+
+    log x;
+    let x:int;
+}
\ No newline at end of file