diff options
| author | Steven Fackler <sfackler@gmail.com> | 2014-04-21 21:19:59 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2014-04-23 20:02:02 -0700 |
| commit | adeeadf49f04faf41eefaf90e16e2df90e6b8f10 (patch) | |
| tree | 2381738ad842b60aed1aff5952119ca57bb44c16 /src/test | |
| parent | 4401f88688eec9052f292ce3b3b8cb96da2853f2 (diff) | |
| download | rust-adeeadf49f04faf41eefaf90e16e2df90e6b8f10.tar.gz rust-adeeadf49f04faf41eefaf90e16e2df90e6b8f10.zip | |
Move task::task() to TaskBuilder::new()
The constructor for `TaskBuilder` is being changed to an associated function called `new` for consistency with the rest of the standard library. Closes #13666 [breaking-change]
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/bench/msgsend-pipes-shared.rs | 3 | ||||
| -rw-r--r-- | src/test/bench/msgsend-pipes.rs | 5 | ||||
| -rw-r--r-- | src/test/bench/shootout-pfib.rs | 3 | ||||
| -rw-r--r-- | src/test/run-fail/fail-task-name-owned.rs | 4 | ||||
| -rw-r--r-- | src/test/run-fail/fail-task-name-send-str.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/fail-task-name-static.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2190-1.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/spawning-with-debug.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/task-comm-12.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/task-comm-3.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/task-comm-9.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/tcp-stress.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/yield.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/yield1.rs | 3 |
14 files changed, 27 insertions, 21 deletions
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index b99d778c399..5a42d2e3c59 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -23,6 +23,7 @@ extern crate time; use std::comm; use std::os; use std::task; +use std::task::TaskBuilder; use std::uint; fn move_out<T>(_x: T) {} @@ -62,7 +63,7 @@ fn run(args: &[~str]) { let mut worker_results = Vec::new(); for _ in range(0u, workers) { let to_child = to_child.clone(); - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); worker_results.push(builder.future_result()); builder.spawn(proc() { for _ in range(0u, size / workers) { diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index af8a89cc597..741cc4be4fa 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -18,6 +18,7 @@ extern crate time; use std::os; use std::task; +use std::task::TaskBuilder; use std::uint; fn move_out<T>(_x: T) {} @@ -56,7 +57,7 @@ fn run(args: &[~str]) { let mut worker_results = Vec::new(); let from_parent = if workers == 1 { let (to_child, from_parent) = channel(); - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); worker_results.push(builder.future_result()); builder.spawn(proc() { for _ in range(0u, size / workers) { @@ -70,7 +71,7 @@ fn run(args: &[~str]) { let (to_child, from_parent) = channel(); for _ in range(0u, workers) { let to_child = to_child.clone(); - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); worker_results.push(builder.future_result()); builder.spawn(proc() { for _ in range(0u, size / workers) { diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 39384ce275a..0819b71853a 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -24,6 +24,7 @@ extern crate time; use std::os; use std::result::{Ok, Err}; use std::task; +use std::task::TaskBuilder; use std::uint; fn fib(n: int) -> int { @@ -77,7 +78,7 @@ fn stress_task(id: int) { fn stress(num_tasks: int) { let mut results = Vec::new(); for i in range(0, num_tasks) { - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); results.push(builder.future_result()); builder.spawn(proc() { stress_task(i); diff --git a/src/test/run-fail/fail-task-name-owned.rs b/src/test/run-fail/fail-task-name-owned.rs index 23ceead0cb0..f30af563aa6 100644 --- a/src/test/run-fail/fail-task-name-owned.rs +++ b/src/test/run-fail/fail-task-name-owned.rs @@ -10,10 +10,10 @@ // error-pattern:task 'owned name' failed at 'test' -use std::task; +use std::task::TaskBuilder; fn main() { - task::task().named("owned name".to_owned()).try(proc() { + TaskBuilder::new().named("owned name".to_owned()).try(proc() { fail!("test"); 1 }).unwrap() diff --git a/src/test/run-fail/fail-task-name-send-str.rs b/src/test/run-fail/fail-task-name-send-str.rs index c21c6c42f6f..d99c805323f 100644 --- a/src/test/run-fail/fail-task-name-send-str.rs +++ b/src/test/run-fail/fail-task-name-send-str.rs @@ -11,7 +11,7 @@ // error-pattern:task 'send name' failed at 'test' fn main() { - ::std::task::task().named("send name".into_maybe_owned()).try(proc() { + ::std::task::TaskBuilder::new().named("send name".into_maybe_owned()).try(proc() { fail!("test"); 3 }).unwrap() diff --git a/src/test/run-fail/fail-task-name-static.rs b/src/test/run-fail/fail-task-name-static.rs index 516f9b2e1d7..e0c98c5744e 100644 --- a/src/test/run-fail/fail-task-name-static.rs +++ b/src/test/run-fail/fail-task-name-static.rs @@ -11,7 +11,7 @@ // error-pattern:task 'static name' failed at 'test' fn main() { - ::std::task::task().named("static name").try(proc() { + ::std::task::TaskBuilder::new().named("static name").try(proc() { fail!("test"); }).unwrap() } diff --git a/src/test/run-pass/issue-2190-1.rs b/src/test/run-pass/issue-2190-1.rs index c8735e79e50..f1217be3484 100644 --- a/src/test/run-pass/issue-2190-1.rs +++ b/src/test/run-pass/issue-2190-1.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::task; +use std::task::TaskBuilder; static generations: uint = 1024+256+128+49; fn spawn(f: proc():Send) { - let mut t = task::task(); + let mut t = TaskBuilder::new(); t.opts.stack_size = Some(32 * 1024); t.spawn(f); } diff --git a/src/test/run-pass/spawning-with-debug.rs b/src/test/run-pass/spawning-with-debug.rs index df6bf767b9d..c8918fda9e7 100644 --- a/src/test/run-pass/spawning-with-debug.rs +++ b/src/test/run-pass/spawning-with-debug.rs @@ -13,9 +13,9 @@ // regression test for issue #10405, make sure we don't call println! too soon. -use std::task; +use std::task::TaskBuilder; pub fn main() { - let mut t = task::task(); + let mut t = TaskBuilder::new(); t.spawn(proc() ()); } diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index 275c99f99a9..a78bbefed44 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -9,6 +9,7 @@ // except according to those terms. use std::task; +use std::task::TaskBuilder; pub fn main() { test00(); } @@ -16,7 +17,7 @@ fn start(_task_number: int) { println!("Started / Finished task."); } fn test00() { let i: int = 0; - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); let mut result = builder.future_result(); builder.spawn(proc() { start(i) diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index c2f6fe580fc..3fb91b67c9d 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -9,7 +9,7 @@ // except according to those terms. -use std::task; +use std::task::TaskBuilder; pub fn main() { println!("===== WITHOUT THREADS ====="); test00(); } @@ -38,7 +38,7 @@ fn test00() { let mut results = Vec::new(); while i < number_of_tasks { let tx = tx.clone(); - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); results.push(builder.future_result()); builder.spawn({ let i = i; diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index 009b013353c..188d8288b09 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -9,7 +9,7 @@ // except according to those terms. -use std::task; +use std::task::TaskBuilder; pub fn main() { test00(); } @@ -24,7 +24,7 @@ fn test00() { let (tx, rx) = channel(); let number_of_messages: int = 10; - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); let result = builder.future_result(); builder.spawn(proc() { test00_start(&tx, number_of_messages); diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs index 063ffed3151..0c38abb20fc 100644 --- a/src/test/run-pass/tcp-stress.rs +++ b/src/test/run-pass/tcp-stress.rs @@ -22,7 +22,7 @@ extern crate rustuv; use std::io::net::ip::{Ipv4Addr, SocketAddr}; use std::io::net::tcp::{TcpListener, TcpStream}; use std::io::{Acceptor, Listener}; -use std::task; +use std::task::TaskBuilder; #[start] fn start(argc: int, argv: **u8) -> int { @@ -61,7 +61,7 @@ fn main() { let (tx, rx) = channel(); for _ in range(0, 1000) { let tx = tx.clone(); - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); builder.opts.stack_size = Some(32 * 1024); builder.spawn(proc() { match TcpStream::connect(addr) { diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs index bd44bdd51cd..2662a6c6568 100644 --- a/src/test/run-pass/yield.rs +++ b/src/test/run-pass/yield.rs @@ -9,9 +9,10 @@ // except according to those terms. use std::task; +use std::task::TaskBuilder; pub fn main() { - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); let mut result = builder.future_result(); builder.spawn(child); println!("1"); diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs index 14ba368bdfa..8c5504725bb 100644 --- a/src/test/run-pass/yield1.rs +++ b/src/test/run-pass/yield1.rs @@ -9,9 +9,10 @@ // except according to those terms. use std::task; +use std::task::TaskBuilder; pub fn main() { - let mut builder = task::task(); + let mut builder = TaskBuilder::new(); let mut result = builder.future_result(); builder.spawn(child); println!("1"); |
