---

yaml
---
r: 56062
b: refs/heads/auto
c: 5f59012
h: refs/heads/master
v: v3

Author: brendanzab

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: e0defb8466e624ded66ef00f092a86b638e01152
+refs/heads/auto: 5f59012cce2675d805e5a6a3af75b76ee015af24
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/unstable/finally.rs

@@ -25,7 +25,7 @@ do || {
 
 use ops::Drop;
 
-#[cfg(test)] use task::failing;
+#[cfg(test)] use task::{failing, spawn};
 
 pub trait Finally<T> {
     fn finally(&self, dtor: &fn()) -> T;
@@ -41,6 +41,26 @@ impl<'self,T> Finally<T> for &'self fn() -> T {
     }
 }
 
+impl<T> Finally<T> for ~fn() -> T {
+    fn finally(&self, dtor: &fn()) -> T {
+        let _d = Finallyalizer {
+            dtor: dtor
+        };
+
+        (*self)()
+    }
+}
+
+impl<T> Finally<T> for @fn() -> T {
+    fn finally(&self, dtor: &fn()) -> T {
+        let _d = Finallyalizer {
+            dtor: dtor
+        };
+
+        (*self)()
+    }
+}
+
 struct Finallyalizer<'self> {
     dtor: &'self fn()
 }
@@ -96,3 +116,24 @@ fn test_compact() {
     do_some_fallible_work.finally(
         but_always_run_this_function);
 }
+
+#[test]
+fn test_owned() {
+    fn spawn_with_finalizer(f: ~fn()) {
+        do spawn { do f.finally { } }
+    }
+    let owned: ~fn() = || { };
+    spawn_with_finalizer(owned);
+}
+
+#[test]
+fn test_managed() {
+    let i = @mut 10;
+    let managed: @fn() -> int = || {
+        let r = *i;
+        *i += 10;
+        r
+    };
+    assert!(do managed.finally {} == 10);
+    assert!(*i == 20);
+}