about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-10-22 19:01:37 -0700
committerBrian Anderson <banderson@mozilla.com>2012-10-23 14:21:15 -0700
commit3e4b2bd2b2f48c98dab73c67b0ddf25a80129a3c (patch)
tree8a6dad33637190806df8065d73e3b00181541bff /src/libstd
parentf6d2a7143629898aebea58db836eb2009e97d067 (diff)
downloadrust-3e4b2bd2b2f48c98dab73c67b0ddf25a80129a3c.tar.gz
rust-3e4b2bd2b2f48c98dab73c67b0ddf25a80129a3c.zip
core: Use PortOne instead of Future in future_result
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/arc.rs2
-rw-r--r--src/libstd/test.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index 2f4c9a4eb06..0033a4eaccd 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -651,7 +651,7 @@ mod tests {
         }
 
         // Wait for children to pass their asserts
-        for vec::each(children) |r| { future::get(r); }
+        for vec::each(children) |r| { r.recv(); }
 
         // Wait for writer to finish
         p.recv();
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index ca83dbf17ed..b5fef604c58 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -391,7 +391,7 @@ fn run_test(test: TestDesc, monitor_ch: comm::Chan<MonitorMsg>) {
         task::task().unlinked().future_result(|+r| {
             result_future = Some(move r);
         }).spawn(move testfn);
-        let task_result = future::get(&option::unwrap(move result_future));
+        let task_result = option::unwrap(move result_future).recv();
         let test_result = calc_result(&test, task_result == task::Success);
         comm::send(monitor_ch, (copy test, test_result));
     };