about summary refs log tree commit diff
path: root/src/libextra
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-17 17:31:52 -0800
committerbors <bors@rust-lang.org>2014-02-17 17:31:52 -0800
commit93a2ee807abafa25555b17b6432d02db53f9e756 (patch)
tree5e678a71ec944ab913a723228742bb3a469cd2f5 /src/libextra
parent25147b2644ed569f16f22dc02d10a0a9b7b97c7e (diff)
parent01b31af4bbf7f066bbce00cc4260b63ac75c23b9 (diff)
downloadrust-93a2ee807abafa25555b17b6432d02db53f9e756.tar.gz
rust-93a2ee807abafa25555b17b6432d02db53f9e756.zip
auto merge of #12232 : kballard/rust/taskbuilder-is-a-builder, r=alexcrichton
Delete all the documentation from std::task that references linked
failure.

Tweak TaskBuilder to be more builder-like. `.name()` is now `.named()` and
`.add_wrapper()` is now `.with_wrapper()`. Remove `.watched()` and
`.unwatched()` as they didn't actually do anything.

Closes #6399.
Diffstat (limited to 'src/libextra')
-rw-r--r--src/libextra/test.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libextra/test.rs b/src/libextra/test.rs
index 07327227d85..8d85dc9b6ff 100644
--- a/src/libextra/test.rs
+++ b/src/libextra/test.rs
@@ -904,15 +904,14 @@ pub fn run_test(force_ignore: bool,
                       monitor_ch: Chan<MonitorMsg>,
                       testfn: proc()) {
         spawn(proc() {
-            let mut task = task::task();
             let (p, c) = Chan::new();
             let mut reader = PortReader::new(p);
             let stdout = ChanWriter::new(c.clone());
             let stderr = ChanWriter::new(c);
-            match desc.name {
-                DynTestName(ref name) => task.name(name.clone()),
-                StaticTestName(name) => task.name(name),
-            }
+            let mut task = task::task().named(match desc.name {
+                DynTestName(ref name) => name.clone().into_maybe_owned(),
+                StaticTestName(name) => name.into_maybe_owned(),
+            });
             task.opts.stdout = Some(~stdout as ~Writer);
             task.opts.stderr = Some(~stderr as ~Writer);
             let result_future = task.future_result();