---

yaml
---
r: 13261
b: refs/heads/master
c: 7daf986
h: refs/heads/master
i:
  13259: ec18c53
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ebde93861fc004aec9d1fdac528cca9aad9a7612
+refs/heads/master: 7daf986aeca81a72be5869a5a41d4fde753eca0f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/test/run-fail/morestack2.rs

@@ -20,18 +20,21 @@ fn getbig_call_c_and_fail(i: int) {
     }
 }
 
-resource and_then_get_big_again(_i: ()) {
+class and_then_get_big_again {
+  new() {}
+  drop {
     fn getbig(i: int) {
         if i != 0 {
             getbig(i - 1);
         }
     }
     getbig(10000);
+  }
 }
 
 fn main() {
     task::spawn {||
-        let r = and_then_get_big_again(());
+        let r = and_then_get_big_again();
         getbig_call_c_and_fail(10000);
     };
 }

trunk/src/test/run-fail/morestack3.rs

@@ -5,21 +5,24 @@
 use std;
 
 fn getbig_and_fail(&&i: int) {
-    let r = and_then_get_big_again(@0);
+    let _r = and_then_get_big_again();
     if i != 0 {
         getbig_and_fail(i - 1);
     } else {
         fail;
     }
 }
 
-resource and_then_get_big_again(_i: @int) {
+class and_then_get_big_again {
+  new() {}
+  drop {
     fn getbig(i: int) {
         if i != 0 {
             getbig(i - 1);
         }
     }
     getbig(100);
+  }
 }
 
 fn main() {

trunk/src/test/run-fail/morestack4.rs

@@ -5,15 +5,17 @@
 use std;
 
 fn getbig_and_fail(&&i: int) {
-    let r = and_then_get_big_again(@0);
+    let r = and_then_get_big_again();
     if i != 0 {
         getbig_and_fail(i - 1);
     } else {
         fail;
     }
 }
 
-resource and_then_get_big_again(_i: @int) {
+class and_then_get_big_again {
+  new() {}
+  drop {}
 }
 
 fn main() {

trunk/src/test/run-fail/rt-set-exit-status-fail2.rs

@@ -1,15 +1,19 @@
 // error-pattern:whatever
 
-fn main() {
-    log(error, "whatever");
-    task::spawn {||
-        resource r(_i: ()) {
+class r {
             // Setting the exit status after the runtime has already
             // failed has no effect and the process exits with the
             // runtime's exit code
-            os::set_exit_status(50);
-        }
-        let i = r(());
+  drop {
+    os::set_exit_status(50);
+  }
+  new() {}
+}
+
+fn main() {
+    log(error, "whatever");
+    task::spawn {||
+      let i = r();
     };
     fail;
 }

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

@@ -9,11 +9,15 @@ fn recurse() {
     recurse();
 }
 
-resource r(recursed: *mut bool) unsafe {
+class r {
+  let recursed: *mut bool;
+  new(recursed: *mut bool) unsafe { self.recursed = recursed; }
+  drop unsafe { 
     if !*recursed {
         *recursed = true;
         recurse();
     }
+  }
 }
 
 fn main() {

trunk/src/test/run-fail/unwind-box-res.rs

@@ -4,8 +4,12 @@ fn failfn() {
     fail;
 }
 
-resource r(v: *int) unsafe {
-    let v2: ~int = unsafe::reinterpret_cast(v);
+class r {
+  let v: *int;
+  new(v: *int) { self.v = v; }
+  drop unsafe {
+    let _v2: ~int = unsafe::reinterpret_cast(self.v);
+  }
 }
 
 fn main() unsafe {

trunk/src/test/run-fail/unwind-resource-fail.rs

@@ -1,9 +1,9 @@
 // error-pattern:fail
 // xfail-test
 
-resource r(i: int) {
-    // What happens when destructors throw?
-    fail;
+class r {
+  new(i:int) {}
+  drop { fail; }
 }
 
 fn main() {

trunk/src/test/run-fail/unwind-resource-fail2.rs

@@ -1,9 +1,9 @@
 // error-pattern:fail
 // xfail-test
 
-resource r(i: int) {
-    // Double-fail!!
-    fail;
+class r {
+  new(i:int) {}
+  drop { fail; }
 }
 
 fn main() {

trunk/src/test/run-fail/unwind-resource-fail3.rs

@@ -1,9 +1,11 @@
 // error-pattern:quux
 // xfail-test
 
-resource faily_box(_i: @int) {
-    // What happens to the box pointer owned by this resource?
-    fail "quux";
+class faily_box {
+  let i: @int;
+  new(i: @int) { self.i = i; }
+  // What happens to the box pointer owned by this class?
+  drop { fail "quux"; }
 }
 
 fn main() {