about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-10-02 14:50:21 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-10-02 14:50:21 -0700
commit67717b61e61ac70fdad19e5a3f5392e663646eb3 (patch)
tree8a6818a8164214ff6195f6073824157c0d86ec06
parentdd0c786d338ef2073848e17b99c53ffdae62eea7 (diff)
parent3dc32a1dedb26c2e4ede9a1c822419c0ed0dd676 (diff)
downloadrust-67717b61e61ac70fdad19e5a3f5392e663646eb3.tar.gz
rust-67717b61e61ac70fdad19e5a3f5392e663646eb3.zip
rollup merge of #17686 : lucidd/fix
-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]