---

yaml
---
r: 149310
b: refs/heads/try2
c: 01b31af
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b94daee395c2ed513ea141021e30dcff8e2590c4
+refs/heads/try2: 01b31af4bbf7f066bbce00cc4260b63ac75c23b9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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();

branches/try2/src/librustc/lib.rs

@@ -371,8 +371,7 @@ pub fn monitor(f: proc()) {
     #[cfg(not(rtopt))]
     static STACK_SIZE: uint = 20000000; // 20MB
 
-    let mut task_builder = task::task();
-    task_builder.name("rustc");
+    let mut task_builder = task::task().named("rustc");
 
     // FIXME: Hacks on hacks. If the env is trying to override the stack size
     // then *don't* set it explicitly.

branches/try2/src/test/run-fail/fail-task-name-owned.rs

@@ -13,9 +13,7 @@
 use std::task;
 
 fn main() {
-    let mut t = task::task();
-    t.name(~"owned name");
-    t.try(proc() {
+    task::task().named(~"owned name").try(proc() {
         fail!("test");
         1
     }).unwrap()

branches/try2/src/test/run-fail/fail-task-name-send-str.rs

@@ -11,9 +11,7 @@
 // error-pattern:task 'send name' failed at 'test'
 
 fn main() {
-    let mut t = ::std::task::task();
-    t.name("send name".into_maybe_owned());
-    t.try(proc() {
+    ::std::task::task().named("send name".into_maybe_owned()).try(proc() {
         fail!("test");
         3
     }).unwrap()

branches/try2/src/test/run-fail/fail-task-name-static.rs

@@ -11,9 +11,7 @@
 // error-pattern:task 'static name' failed at 'test'
 
 fn main() {
-    let mut t = ::std::task::task();
-    t.name("static name");
-    t.try(proc() {
+    ::std::task::task().named("static name").try(proc() {
         fail!("test");
     }).unwrap()
 }