---

yaml
---
r: 14781
b: refs/heads/try
c: 9838a7e
h: refs/heads/master
i:
  14779: 6369a3c
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: eb9d0e89d19477e89fadf55c0de8376b5ba6dd5c
+refs/heads/try: 9838a7ec5497d7d031354f77b578a7fa071129fe
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/test/compile-fail/block-must-not-have-result-do.rs

@@ -1,7 +1,7 @@
 // error-pattern:mismatched types: expected `()` but found `bool`
 
 fn main() {
-    do {
+    loop {
         true
-    } while true;
+    }
 }

branches/try/src/test/compile-fail/block-must-not-have-result-while.rs

@@ -1,7 +1,7 @@
 // error-pattern:mismatched types: expected `()` but found `bool`
 
 fn main() {
-    loop {
+    while true {
         true
     }
 }

branches/try/src/test/compile-fail/do-while-constraints.rs

@@ -3,8 +3,8 @@ fn main() {
 
     let y: int = 42;
     let x: int;
-    do  {
+    loop {
         log(debug, y);
         do  { do  { do  { x <- y; } while true } while true } while true
-    } while true
+    }
 }

branches/try/src/test/compile-fail/do-while-pred-constraints.rs

@@ -7,8 +7,8 @@ pure fn even(y: int) -> bool { true }
 fn main() {
     let y: int = 42;
     check (even(y));
-    do  {
+    loop {
         print_even(y);
         do  { do  { do  { y += 1; } while false } while false } while false
-    } while true
+    }
 }

branches/try/src/test/compile-fail/unreachable-code.rs

@@ -0,0 +1,6 @@
+// error-pattern:unreachable statement
+fn main() {
+  loop{}
+             // red herring to make sure compilation fails
+  log(error, 42 == 'c');
+}

branches/try/src/test/run-pass/loop-break-cont-1.rs

@@ -0,0 +1,7 @@
+fn main() {
+  let i = 0u;
+  loop {
+    break;
+  }
+  assert true;
+}

branches/try/src/test/run-pass/loop-break-cont.rs

@@ -0,0 +1,40 @@
+// xfail-test
+// runs forever for some reason -- investigating
+fn main() {
+  let i = 0u;
+  loop {
+    log(error, "a");
+    i += 1u;
+    if i == 10u {
+      break;
+    }
+  }
+  assert (i == 10u);
+  let is_even = false;
+  loop {
+    log(error, "b");
+    is_even = false;
+    i += 1u;
+    if i % 2u != 0u {
+        cont;
+    }
+    is_even = true;
+    if i == 21u {
+        break;
+    }
+  }
+  assert !is_even;
+  loop {
+    log(error, "c");
+    is_even = false;
+    if i == 22u {
+        break;
+    }
+    i += 1u;
+    if i % 2u != 0u {
+        cont;
+    }
+    is_even = true;
+  }
+  assert is_even;
+}

branches/try/src/test/run-pass/terminate-in-initializer.rs

@@ -1,6 +1,6 @@
 // xfail-win32 leaks
 // Issue #787
-// Don't try to clean up uninitizaed locals
+// Don't try to clean up uninitialized locals
 
 use std;