---

yaml
---
r: 37606
b: refs/heads/try
c: 624fbbd
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 12a41307490c3d3188086b5964332df50b3c3a9d
+refs/heads/try: 624fbbd3d117f7199d69c923c051a6d46a4b88b7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/run-fail/fail-parens.rs

@@ -1,13 +1,13 @@
-// xfail-test
 // Fail statements without arguments need to be disambiguated in
 // certain positions
-// error-pattern:explicit-failure
+// error-pattern:oops
 
 fn bigfail() {
-    do { while (fail) { if (fail) {
-        match (fail) { _ {
-        }}
-    }}} while fail;
+    while (fail ~"oops") { if (fail) {
+        match (fail) { () => {
+        }
+                     }
+    }};
 }
 
 fn main() { bigfail(); }

branches/try/src/test/run-fail/too-much-recursion-unwinding.rs

@@ -1,27 +1,29 @@
 // error-pattern:ran out of stack
-// xfail-test - right now we leak when we fail during failure
 
 // Test that the task fails after hiting the recursion limit
-// durnig unwinding
+// during unwinding
 
 fn recurse() {
     log(debug, "don't optimize me out");
     recurse();
 }
 
-class r {
-  let recursed: *mut bool;
-  new(recursed: *mut bool) unsafe { self.recursed = recursed; }
-  drop unsafe { 
-    if !*recursed {
-        *recursed = true;
-        recurse();
+struct r {
+    recursed: *mut bool,
+    drop unsafe { 
+        if !*(self.recursed) {
+            *(self.recursed) = true;
+            recurse();
+        }
     }
-  }
+}
+
+fn r(recursed: *mut bool) -> r unsafe {
+    r { recursed: recursed }
 }
 
 fn main() {
     let mut recursed = false;
-    let _r = r(ptr::mut_addr_of(recursed));
+    let _r = r(ptr::mut_addr_of(&recursed));
     recurse();
 }

branches/try/src/test/run-fail/unwind-resource-fail.rs

@@ -1,11 +1,12 @@
-// error-pattern:fail
-// xfail-test
+// error-pattern:squirrel
 
-class r {
-  new(i:int) {}
-  drop { fail; }
+struct r {
+    i: int,
+    drop { fail ~"squirrel" }
 }
 
+fn r(i: int) -> r { r { i: i } }
+
 fn main() {
     @0;
     let r = move r(0);

branches/try/src/test/run-fail/unwind-resource-fail2.rs

@@ -1,11 +1,12 @@
-// error-pattern:fail
-// xfail-test
+// error-pattern:wombat
 
-class r {
-  new(i:int) {}
-  drop { fail; }
+struct r {
+    i: int,
+    drop { fail ~"wombat" }
 }
 
+fn r(i: int) -> r { r { i: i } }
+
 fn main() {
     @0;
     let r = move r(0);

branches/try/src/test/run-fail/unwind-resource-fail3.rs

@@ -1,15 +1,15 @@
 // error-pattern:quux
-// xfail-test
 
-class faily_box {
-  let i: @int;
-  new(i: @int) { self.i = i; }
-  // What happens to the box pointer owned by this class?
+struct faily_box {
+    i: @int
 }
+// What happens to the box pointer owned by this class?
+ 
+fn faily_box(i: @int) -> faily_box { faily_box { i: i } }
 
 impl faily_box : Drop {
     fn finalize() {
-        fail "quux";
+        fail ~"quux";
     }
 }