Rename task::task_builder to task::builder

Closes #2120.

Author: catamorphism

src/libcore/task.rs

@@ -30,7 +30,7 @@ export notification;
 export sched_mode;
 export sched_opts;
 export task_opts;
-export task_builder::{};
+export builder::{};
 
 export default_task_opts;
 export get_opts;
@@ -162,8 +162,8 @@ Provides detailed control over the properties and behavior of new tasks.
 // when you try to reuse the builder to spawn a new task. We'll just
 // sidestep that whole issue by making builder's uncopyable and making
 // the run function move them in.
-enum task_builder {
-    task_builder_({
+enum builder {
+    builder_({
         mut opts: task_opts,
         mut gen_body: fn@(+fn~()) -> fn~(),
         can_not_copy: option<comm::port<()>>
@@ -188,27 +188,27 @@ fn default_task_opts() -> task_opts {
     }
 }
 
-fn task_builder() -> task_builder {
-    #[doc = "Construct a task_builder"];
+fn builder() -> builder {
+    #[doc = "Construct a builder"];
 
     let body_identity = fn@(+body: fn~()) -> fn~() { body };
 
-    task_builder_({
+    builder_({
         mut opts: default_task_opts(),
         mut gen_body: body_identity,
         can_not_copy: none
     })
 }
 
-fn get_opts(builder: task_builder) -> task_opts {
-    #[doc = "Get the task_opts associated with a task_builder"];
+fn get_opts(builder: builder) -> task_opts {
+    #[doc = "Get the task_opts associated with a builder"];
 
     builder.opts
 }
 
-fn set_opts(builder: task_builder, opts: task_opts) {
+fn set_opts(builder: builder, opts: task_opts) {
     #[doc = "
-    Set the task_opts associated with a task_builder
+    Set the task_opts associated with a builder
 
     To update a single option use a pattern like the following:
 
@@ -221,7 +221,7 @@ fn set_opts(builder: task_builder, opts: task_opts) {
     builder.opts = opts;
 }
 
-fn add_wrapper(builder: task_builder, gen_body: fn@(+fn~()) -> fn~()) {
+fn add_wrapper(builder: builder, gen_body: fn@(+fn~()) -> fn~()) {
     #[doc = "
     Add a wrapper to the body of the spawned task.
 
@@ -241,7 +241,7 @@ fn add_wrapper(builder: task_builder, gen_body: fn@(+fn~()) -> fn~()) {
     };
 }
 
-fn run(-builder: task_builder, +f: fn~()) {
+fn run(-builder: builder, +f: fn~()) {
     #[doc = "
     Creates and exucutes a new child task
 
@@ -262,7 +262,7 @@ fn run(-builder: task_builder, +f: fn~()) {
 
 /* Builder convenience functions */
 
-fn future_result(builder: task_builder) -> future::future<task_result> {
+fn future_result(builder: builder) -> future::future<task_result> {
     #[doc = "
     Get a future representing the exit status of the task.
 
@@ -295,7 +295,7 @@ fn future_result(builder: task_builder) -> future::future<task_result> {
     }
 }
 
-fn future_task(builder: task_builder) -> future::future<task> {
+fn future_task(builder: builder) -> future::future<task> {
     #[doc = "Get a future representing the handle to the new task"];
 
     let mut po = comm::port();
@@ -309,7 +309,7 @@ fn future_task(builder: task_builder) -> future::future<task> {
     future::from_port(po)
 }
 
-fn unsupervise(builder: task_builder) {
+fn unsupervise(builder: builder) {
     #[doc = "Configures the new task to not propagate failure to its parent"];
 
     set_opts(builder, {
@@ -318,7 +318,7 @@ fn unsupervise(builder: task_builder) {
     });
 }
 
-fn run_listener<A:send>(-builder: task_builder,
+fn run_listener<A:send>(-builder: builder,
                         +f: fn~(comm::port<A>)) -> comm::chan<A> {
     #[doc = "
     Runs a new task while providing a channel from the parent to the child
@@ -355,10 +355,10 @@ fn spawn(+f: fn~()) {
     Sets up a new task with its own call stack and schedules it to run
     the provided unique closure.
 
-    This function is equivalent to `run(new_task_builder(), f)`.
+    This function is equivalent to `run(new_builder(), f)`.
     "];
 
-    run(task_builder(), f);
+    run(builder(), f);
 }
 
 fn spawn_listener<A:send>(+f: fn~(comm::port<A>)) -> comm::chan<A> {
@@ -384,10 +384,10 @@ fn spawn_listener<A:send>(+f: fn~(comm::port<A>)) -> comm::chan<A> {
         };
         // Likewise, the parent has both a 'po' and 'ch'
 
-    This function is equivalent to `run_listener(new_task_builder(), f)`.
+    This function is equivalent to `run_listener(new_builder(), f)`.
     "];
 
-    run_listener(task_builder(), f)
+    run_listener(builder(), f)
 }
 
 fn spawn_sched(mode: sched_mode, +f: fn~()) {
@@ -404,7 +404,7 @@ fn spawn_sched(mode: sched_mode, +f: fn~()) {
     greater than zero.
     "];
 
-    let mut builder = task_builder();
+    let mut builder = builder();
     set_opts(builder, {
         sched: some({
             mode: mode,
@@ -429,7 +429,7 @@ fn try<T:send>(+f: fn~() -> T) -> result<T,()> {
 
     let po = comm::port();
     let ch = comm::chan(po);
-    let mut builder = task_builder();
+    let mut builder = builder();
     unsupervise(builder);
     let result = future_result(builder);
     run(builder) {||
@@ -626,8 +626,8 @@ fn test_spawn_raw_notify() {
 fn test_run_basic() {
     let po = comm::port();
     let ch = comm::chan(po);
-    let builder = task_builder();
-    run(builder) {||
+    let buildr = builder();
+    run(buildr) {||
         comm::send(ch, ());
     }
     comm::recv(po);
@@ -637,39 +637,39 @@ fn test_run_basic() {
 fn test_add_wrapper() {
     let po = comm::port();
     let ch = comm::chan(po);
-    let builder = task_builder();
-    add_wrapper(builder) {|body|
+    let buildr = builder();
+    add_wrapper(buildr) {|body|
         fn~() {
             body();
             comm::send(ch, ());
         }
     }
-    run(builder) {||}
+    run(buildr) {||}
     comm::recv(po);
 }
 
 #[test]
 #[ignore(cfg(target_os = "win32"))]
 fn test_future_result() {
-    let builder = task_builder();
-    let result = future_result(builder);
-    run(builder) {||}
+    let buildr = builder();
+    let result = future_result(buildr);
+    run(buildr) {||}
     assert future::get(result) == success;
 
-    let builder = task_builder();
-    let result = future_result(builder);
-    unsupervise(builder);
-    run(builder) {|| fail }
+    let buildr = builder();
+    let result = future_result(buildr);
+    unsupervise(buildr);
+    run(buildr) {|| fail }
     assert future::get(result) == failure;
 }
 
 #[test]
 fn test_future_task() {
     let po = comm::port();
     let ch = comm::chan(po);
-    let builder = task_builder();
-    let task1 = future_task(builder);
-    run(builder) {|| comm::send(ch, get_task()) }
+    let buildr = builder();
+    let task1 = future_task(buildr);
+    run(buildr) {|| comm::send(ch, get_task()) }
     assert future::get(task1) == comm::recv(po);
 }
 
@@ -863,8 +863,8 @@ fn test_avoid_copying_the_body_spawn_listener() {
 #[test]
 fn test_avoid_copying_the_body_run() {
     avoid_copying_the_body {|f|
-        let builder = task_builder();
-        run(builder) {||
+        let buildr = builder();
+        run(buildr) {||
             f();
         }
     }
@@ -873,8 +873,8 @@ fn test_avoid_copying_the_body_run() {
 #[test]
 fn test_avoid_copying_the_body_run_listener() {
     avoid_copying_the_body {|f|
-        let builder = task_builder();
-        run_listener(builder, fn~[move f](_po: comm::port<int>) {
+        let buildr = builder();
+        run_listener(buildr, fn~[move f](_po: comm::port<int>) {
             f();
         });
     }
@@ -892,9 +892,9 @@ fn test_avoid_copying_the_body_try() {
 #[test]
 fn test_avoid_copying_the_body_future_task() {
     avoid_copying_the_body {|f|
-        let builder = task_builder();
-        future_task(builder);
-        run(builder) {||
+        let buildr = builder();
+        future_task(buildr);
+        run(buildr) {||
             f();
         }
     }
@@ -903,29 +903,29 @@ fn test_avoid_copying_the_body_future_task() {
 #[test]
 fn test_avoid_copying_the_body_unsupervise() {
     avoid_copying_the_body {|f|
-        let builder = task_builder();
-        unsupervise(builder);
-        run(builder) {||
+        let buildr = builder();
+        unsupervise(buildr);
+        run(buildr) {||
             f();
         }
     }
 }
 
 #[test]
 fn test_osmain() {
-    let builder = task_builder();
+    let buildr = builder();
     let opts = {
         sched: some({
             mode: osmain,
             native_stack_size: none
         })
-        with get_opts(builder)
+        with get_opts(buildr)
     };
-    set_opts(builder, opts);
+    set_opts(buildr, opts);
 
     let po = comm::port();
     let ch = comm::chan(po);
-    run(builder) {||
+    run(buildr) {||
         comm::send(ch, ());
     }
     comm::recv(po);

src/libstd/test.rs

@@ -390,7 +390,7 @@ fn run_test(+test: test_desc, monitor_ch: comm::chan<monitor_msg>) {
 
     task::spawn {||
         let testfn = test.fn;
-        let mut builder = task::task_builder();
+        let mut builder = task::builder();
         let result_future = task::future_result(builder);
         task::unsupervise(builder);
         task::run(builder, testfn);

src/test/bench/msgsend.rs

@@ -39,7 +39,7 @@ fn run(args: [str]) {
     let to_child = to_child;
     let mut worker_results = [];
     uint::range(0u, workers) {|_i|
-        let builder = task::task_builder();
+        let builder = task::builder();
         worker_results += [task::future_result(builder)];
         task::run(builder) {||
             uint::range(0u, size / workers) {|_i|

src/test/bench/shootout-pfib.rs

@@ -71,7 +71,7 @@ fn stress_task(&&id: int) {
 fn stress(num_tasks: int) {
     let mut results = [];
     range(0, num_tasks) {|i|
-        let builder = task::task_builder();
+        let builder = task::builder();
         results += [task::future_result(builder)];
         task::run(builder) {|| stress_task(i); }
     }

src/test/bench/task-perf-word-count.rs

@@ -62,7 +62,7 @@ mod map_reduce {
        [future::future<task::task_result>] {
         let mut results = [];
         for i: str in inputs {
-            let builder = task::task_builder();
+            let builder = task::builder();
             results += [task::future_result(builder)];
             task::run(builder) {|| map_task(ctrl, i)}
         }
@@ -160,7 +160,7 @@ mod map_reduce {
                     // log(error, "creating new reducer for " + k);
                     let p = port();
                     let ch = chan(p);
-                    let builder = task::task_builder();
+                    let builder = task::builder();
                     results += [task::future_result(builder)];
                     task::run(builder) {||reduce_task(k, ch)}
                     c = recv(p);

src/test/run-pass/lots-a-fail.rs

@@ -14,7 +14,7 @@ fn iloop() {
 
 fn main() {
     uint::range(0u, 100u) {|_i|
-        let builder = task::task_builder();
+        let builder = task::builder();
         task::unsupervise(builder);
         task::run(builder) {|| iloop(); };
     }

src/test/run-pass/osmain.rs

@@ -14,7 +14,7 @@ fn run(i: int) {
         ret;
     }
 
-    let builder = task::task_builder();
+    let builder = task::builder();
     let opts = {
         sched: some({
             mode: task::osmain,
@@ -26,7 +26,7 @@ fn run(i: int) {
     task::unsupervise(builder);
     task::run(builder) {||
         task::yield();
-        let builder = task::task_builder();
+        let builder = task::builder();
         let opts = {
             sched: some({
                 mode: task::single_threaded,

src/test/run-pass/send-iloop.rs

@@ -22,7 +22,7 @@ fn iloop() {
 
 fn main() {
     uint::range(0u, 16u) {|_i|
-        let builder = task::task_builder();
+        let builder = task::builder();
         task::unsupervise(builder);
         task::run(builder) {|| iloop(); }
     }

src/test/run-pass/task-comm-12.rs

@@ -7,7 +7,7 @@ fn start(&&task_number: int) { #debug("Started / Finished task."); }
 
 fn test00() {
     let i: int = 0;
-    let builder = task::task_builder();
+    let builder = task::builder();
     let r = task::future_result(builder);
     task::run(builder) {|| start(i); };
 

src/test/run-pass/task-comm-3.rs

@@ -32,7 +32,7 @@ fn test00() {
     // Create and spawn tasks...
     let mut results = [];
     while i < number_of_tasks {
-        let builder = task::task_builder();
+        let builder = task::builder();
         results += [task::future_result(builder)];
         task::run(builder) {||
             test00_start(ch, i, number_of_messages)

src/test/run-pass/task-comm-9.rs

@@ -16,7 +16,7 @@ fn test00() {
     let number_of_messages: int = 10;
     let ch = comm::chan(p);
 
-    let builder = task::task_builder();
+    let builder = task::builder();
     let r = task::future_result(builder);
     task::run(builder) {||
         test00_start(ch, number_of_messages);