about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-03 05:02:37 +0000
committerbors <bors@rust-lang.org>2014-10-03 05:02:37 +0000
commitaa034cd3bac3155e0f6c74c399314b5ee32f88fc (patch)
tree891acff8f9158a69e1884707ca3bfb70d749db2e /src/libstd/sync
parentd0af3feebb57bc58c52de69ab51f92dc7082500b (diff)
parentd911936dbdc645133ad9605f45d2bf10b73e2b20 (diff)
downloadrust-aa034cd3bac3155e0f6c74c399314b5ee32f88fc.tar.gz
rust-aa034cd3bac3155e0f6c74c399314b5ee32f88fc.zip
auto merge of #17725 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/future.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs
index 78da605143d..621c08fe7bc 100644
--- a/src/libstd/sync/future.rs
+++ b/src/libstd/sync/future.rs
@@ -201,12 +201,13 @@ mod test {
     #[test]
     fn test_sendable_future() {
         let expected = "schlorf";
+        let (tx, rx) = channel();
         let f = Future::spawn(proc() { expected });
         task::spawn(proc() {
             let mut f = f;
-            let actual = f.get();
-            assert_eq!(actual, expected);
+            tx.send(f.get());
         });
+        assert_eq!(rx.recv(), expected);
     }
 
     #[test]