From 18ac4a8e6d8db5ac8902bef504e220e0cd372cd1 Mon Sep 17 00:00:00 2001 From: Ben Blum Date: Tue, 7 Aug 2012 14:26:03 -0400 Subject: [PATCH] Change task().future_result's argument mode --- src/libcore/task.rs | 10 +++++----- src/libstd/test.rs | 2 +- src/test/bench/msgsend-pipes-shared.rs | 2 +- src/test/bench/msgsend-pipes.rs | 2 +- src/test/bench/msgsend.rs | 2 +- src/test/bench/shootout-pfib.rs | 2 +- src/test/bench/task-perf-linked-failure.rs | 2 +- src/test/run-pass/task-comm-12.rs | 2 +- src/test/run-pass/task-comm-3.rs | 2 +- src/test/run-pass/task-comm-9.rs | 2 +- src/test/run-pass/task-comm.rs | 4 ++-- src/test/run-pass/yield.rs | 2 +- src/test/run-pass/yield1.rs | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libcore/task.rs b/src/libcore/task.rs index 06f3c0b2f50..c066e7d6f51 100644 --- a/src/libcore/task.rs +++ b/src/libcore/task.rs @@ -271,7 +271,7 @@ impl task_builder for task_builder { * # Failure * Fails if a future_result was already set for this task. */ - fn future_result(blk: fn(-future::future)) -> task_builder { + fn future_result(blk: fn(+future::future)) -> task_builder { // FIXME (#1087, #1857): Once linked failure and notification are // handled in the library, I can imagine implementing this by just // registering an arbitrary number of task::on_exit handlers and @@ -394,7 +394,7 @@ impl task_builder for task_builder { let ch = comm::chan(po); let mut result = none; - do self.future_result(|-r| { result = some(r); }).spawn { + do self.future_result(|+r| { result = some(r); }).spawn { comm::send(ch, f()); } match future::get(option::unwrap(result)) { @@ -1684,11 +1684,11 @@ fn test_add_wrapper() { #[ignore(cfg(windows))] fn test_future_result() { let mut result = none; - do task().future_result(|-r| { result = some(r); }).spawn { } + do task().future_result(|+r| { result = some(r); }).spawn { } assert future::get(option::unwrap(result)) == success; result = none; - do task().future_result(|-r| { result = some(r); }).unlinked().spawn { + do task().future_result(|+r| { result = some(r); }).unlinked().spawn { fail; } assert future::get(option::unwrap(result)) == failure; @@ -1696,7 +1696,7 @@ fn test_future_result() { #[test] #[should_fail] #[ignore(cfg(windows))] fn test_back_to_the_future_result() { - let _ = task().future_result(|-r| ()).future_result(|-r| ()); + let _ = task().future_result(util::ignore).future_result(util::ignore); } #[test] diff --git a/src/libstd/test.rs b/src/libstd/test.rs index a4b52c51685..b67d7e66402 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -390,7 +390,7 @@ fn run_test(+test: test_desc, monitor_ch: comm::chan) { do task::spawn { let testfn = copy test.fn; let mut result_future = none; // task::future_result(builder); - task::task().unlinked().future_result(|-r| { + task::task().unlinked().future_result(|+r| { result_future = some(r); }).spawn(testfn); let task_result = future::get(option::unwrap(result_future)); diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index 423cec10f5a..c2129aa5fda 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -58,7 +58,7 @@ fn run(args: &[~str]) { let mut worker_results = ~[]; for uint::range(0u, workers) |i| { let to_child = to_child.clone(); - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { vec::push(worker_results, r); }).spawn { for uint::range(0u, size / workers) |_i| { diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 60cc52825e8..724bdf23e01 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -54,7 +54,7 @@ fn run(args: &[~str]) { for uint::range(0u, workers) |i| { let (to_child, from_parent_) = pipes::stream(); from_parent.add(from_parent_); - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { vec::push(worker_results, r); }).spawn { for uint::range(0u, size / workers) |_i| { diff --git a/src/test/bench/msgsend.rs b/src/test/bench/msgsend.rs index adbf6253214..120a5f3a1f0 100644 --- a/src/test/bench/msgsend.rs +++ b/src/test/bench/msgsend.rs @@ -39,7 +39,7 @@ fn run(args: ~[~str]) { let to_child = to_child; let mut worker_results = ~[]; for uint::range(0u, workers) |_i| { - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { vec::push(worker_results, r); }).spawn { for uint::range(0u, size / workers) |_i| { diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 4b4d41e72ba..3aa3dee050b 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -70,7 +70,7 @@ fn stress_task(&&id: int) { fn stress(num_tasks: int) { let mut results = ~[]; for range(0, num_tasks) |i| { - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { results += ~[r]; }).spawn { stress_task(i); diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/task-perf-linked-failure.rs index a806950d0f7..3dc0de2279c 100644 --- a/src/test/bench/task-perf-linked-failure.rs +++ b/src/test/bench/task-perf-linked-failure.rs @@ -31,7 +31,7 @@ fn grandchild_group(num_tasks: uint) { fn spawn_supervised_blocking(myname: &str, +f: fn~()) { let mut res = none; - task::task().future_result(|-r| res = some(r)).supervised().spawn(f); + task::task().future_result(|+r| res = some(r)).supervised().spawn(f); #error["%s group waiting", myname]; let x = future::get(option::unwrap(res)); assert x == task::success; diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index 53d8ede2240..20d1ad57bc1 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -8,7 +8,7 @@ fn start(&&task_number: int) { debug!{"Started / Finished task."}; } fn test00() { let i: int = 0; let mut result = none; - do task::task().future_result(|-r| { result = some(r); }).spawn { + do task::task().future_result(|+r| { result = some(r); }).spawn { start(i) } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index c68ee5a2a0c..44bd0107684 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -32,7 +32,7 @@ fn test00() { let mut results = ~[]; while i < number_of_tasks { let ch = po.chan(); - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { results += ~[r]; }).spawn |copy i| { test00_start(ch, i, number_of_messages) diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index 939cfd15797..65977d7997d 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -16,7 +16,7 @@ fn test00() { let ch = p.chan(); let mut result = none; - do task::task().future_result(|-r| { result = some(r); }).spawn { + do task::task().future_result(|+r| { result = some(r); }).spawn { test00_start(ch, number_of_messages); } diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs index d66dbd26694..3ca0421c235 100644 --- a/src/test/run-pass/task-comm.rs +++ b/src/test/run-pass/task-comm.rs @@ -41,7 +41,7 @@ fn test00() { let mut results = ~[]; while i < number_of_tasks { i = i + 1; - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { results += ~[r]; }).spawn |copy i| { test00_start(ch, i, number_of_messages); @@ -128,7 +128,7 @@ fn test06() { let mut results = ~[]; while i < number_of_tasks { i = i + 1; - do task::task().future_result(|-r| { + do task::task().future_result(|+r| { results += ~[r]; }).spawn |copy i| { test06_start(i); diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs index 4d880c4390e..9a5b72f9708 100644 --- a/src/test/run-pass/yield.rs +++ b/src/test/run-pass/yield.rs @@ -5,7 +5,7 @@ import task::*; fn main() { let mut result = none; - task::task().future_result(|-r| { result = some(r); }).spawn(child); + task::task().future_result(|+r| { result = some(r); }).spawn(child); error!{"1"}; yield(); error!{"2"}; diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs index 51f837f74c5..c2bc3bfbc1f 100644 --- a/src/test/run-pass/yield1.rs +++ b/src/test/run-pass/yield1.rs @@ -5,7 +5,7 @@ import task::*; fn main() { let mut result = none; - task::task().future_result(|-r| { result = some(r); }).spawn(child); + task::task().future_result(|+r| { result = some(r); }).spawn(child); error!{"1"}; yield(); future::get(option::unwrap(result));