---

yaml
---
r: 28394
b: refs/heads/try
c: d41af3e
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: a8fc771f2004c376bbde68d09ead45d679f8f597
+refs/heads/try: d41af3e00229c2c32890360eb760219eeb14e724
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/task.rs

@@ -366,17 +366,22 @@ impl TaskBuilder {
         }
 
         // Construct the future and give it to the caller.
-        let (ch, po) = stream::<Notification>();
+        let (notify_pipe_ch, notify_pipe_po) = stream::<Notification>();
 
         blk(do future::from_fn {
-            match po.recv() {
+            match notify_pipe_po.recv() {
               Exit(_, result) => result
             }
         });
 
         // Reconfigure self to use a notify channel.
         TaskBuilder({
-            opts: { notify_chan: Some(ch),.. self.opts },
+            opts: {
+                linked: self.opts.linked,
+                supervised: self.opts.supervised,
+                mut notify_chan: Some(notify_pipe_ch),
+                sched: self.opts.sched
+            },
             can_not_copy: None,
             .. *self.consume()
         })
@@ -445,12 +450,14 @@ impl TaskBuilder {
      * must be greater than zero.
      */
     fn spawn(+f: fn~()) {
-        let x = self.consume();
-        let notify_chan = if self.opts.notify_chan == None {
+        let notify_chan = if self.opts.notify_chan == none {
             None
         } else {
-            Some(option::swap_unwrap(&mut self.opts.notify_chan))
+            let swapped_notify_chan =
+                option::swap_unwrap(&mut self.opts.notify_chan);
+            some(swapped_notify_chan)
         };
+        let x = self.consume();
         let opts = {
             linked: x.opts.linked,
             supervised: x.opts.supervised,
@@ -522,7 +529,8 @@ impl TaskBuilder {
         let ch = comm::Chan(po);
         let mut result = None;
 
-        do self.future_result(|+r| { result = Some(r); }).spawn {
+        let fr_task_builder = self.future_result(|+r| { result = Some(r); });
+        do fr_task_builder.spawn {
             comm::send(ch, f());
         }
         match future::get(&option::unwrap(result)) {