Adding in more examples for DoneHandle

Author: Pauan

examples/promise/src/main.rs

@@ -19,6 +19,15 @@ fn log( a: &str ) {
 }
 
 
+fn sleep( ms: u32 ) -> PromiseFuture< Null > {
+    js!( return new Promise( function ( success, failure ) {
+        setTimeout( function () {
+            success( null );
+        }, @{ms} );
+    } ); ).try_into().unwrap()
+}
+
+
 fn test_from_thenable() {
     let a = Promise::from_thenable( &js!( return Promise.resolve(5); ).try_into().unwrap() );
 
@@ -233,14 +242,6 @@ fn test_notify() {
 
 
 fn test_timeout() {
-    fn sleep( ms: u32 ) -> PromiseFuture< Null > {
-        js!( return new Promise( function ( success, failure ) {
-            setTimeout( function () {
-                success( null );
-            }, @{ms} );
-        } ); ).try_into().unwrap()
-    }
-
     PromiseFuture::spawn(
         sleep( 2000 ).inspect( |_| log( "Timeout 1 done!") ).join(
         sleep( 2000 ).inspect( |_| log( "Timeout 2 done!" ) ) )
@@ -267,15 +268,41 @@ fn test_callback_drop() {
         }
     }
 
-    let y = Foo( js!(
-        return setInterval( function () {
-            console.log( "Callback drop interval" );
-        }, 1000 );
-    ) );
+    fn make_interval() -> Foo {
+        Foo( js!(
+            return setInterval( function () {
+                console.log( "Callback drop interval" );
+            }, 1000 );
+        ) )
+    }
+
+    let y = make_interval();
 
     x.done( move |_result: Result< (), () >| {
         let _z = y;
     } );
+
+
+    struct Bar;
+
+    impl Drop for Bar {
+        fn drop( &mut self ) {
+            log( "Bar dropped" );
+        }
+    }
+
+    let bar = Bar;
+
+    PromiseFuture::spawn(
+        x.to_future::< (), Error >()
+            .map( move |_| {
+                let _y = bar;
+                ()
+            } )
+            .select( sleep( 5000 ).map( |_| () ) )
+            .map( |_| () )
+            .map_err( |( e, _ )| e.print() )
+    );
 }
 
 

src/webcore/promise.rs

@@ -10,6 +10,7 @@ use futures::unsync::oneshot::channel;
 use super::promise_future::PromiseFuture;
 
 
+///
 #[derive( Debug, Clone )]
 pub struct DoneHandle {
     callback: Value,
@@ -117,7 +118,7 @@ impl Promise {
               B::Error: std::fmt::Debug,
               F: FnOnce( Result< A, B > ) + 'static {
 
-        let callback = |value: Value, success: bool| {
+        let callback = move |value: Value, success: bool| {
             let value: Result< A, B > = if success {
                 // TODO figure out a way to avoid the unwrap
                 let value: A = value.try_into().unwrap();
@@ -154,7 +155,7 @@ impl Promise {
 
         DoneHandle {
             callback,
-            done
+            done,
         }
     }
 
@@ -187,7 +188,7 @@ impl Promise {
                     Ok( _ ) => {},
                     Err( _ ) => {},
                 };
-            } )
+            } ),
         }
     }
 }