From 3e5815837594c3fdf2a67bc735a4b3de4009c798 Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Fri, 7 Sep 2012 13:11:15 -0700
Subject: [PATCH] core: most rebase cruft cleanup

---
 src/libcore/task.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index a0c7a61f29b..3bdfe152aec 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -1094,7 +1094,7 @@ struct AutoNotify {
     }
 }
 
-fn AutoNotify(chan: Chan<Notification>) -> AutoNotify {
+fn AutoNotify(+chan: Chan<Notification>) -> AutoNotify {
     AutoNotify {
         notify_chan: chan,
         failed: true // Un-set above when taskgroup successfully made.
@@ -1667,6 +1667,7 @@ fn test_spawn_raw_simple() {
 fn test_spawn_raw_unsupervise() {
     let opts = {
         linked: false,
+        mut notify_chan: None,
         .. default_task_opts()
     };
     do spawn_raw(opts) {
@@ -1842,7 +1843,7 @@ fn test_spawn_raw_notify_success() {
     let (notify_ch, notify_po) = pipes::stream();
 
     let opts = {
-        notify_chan: Some(move notify_ch)
+        notify_chan: Some(move notify_ch),
         .. default_task_opts()
     };
     do spawn_raw(opts) |move task_ch| {