auto merge of #11868 : bytbox/rust/remove-do, r=alexcrichton

Fixes #10815.

2 files changed, 18 insertions, 18 deletions

diff --git a/src/libnative/io/timer_helper.rs b/src/libnative/io/timer_helper.rs
index 3c20d073f29..9fc18220386 100644
--- a/src/libnative/io/timer_helper.rs
+++ b/src/libnative/io/timer_helper.rs
@@ -46,10 +46,10 @@ pub fn boot(helper: fn(imp::signal, Port<Req>)) {
             let (receive, send) = imp::new();
             HELPER_SIGNAL = send;
 
-            do task::spawn {
+            task::spawn(proc() {
                 bookkeeping::decrement();
                 helper(receive, msgp);
-            }
+            });
 
             rt::at_exit(proc() { shutdown() });
         })
diff --git a/src/libnative/task.rs b/src/libnative/task.rs
index d2f68c4ef68..438ac4add39 100644
--- a/src/libnative/task.rs
+++ b/src/libnative/task.rs
@@ -272,19 +272,19 @@ mod tests {
     #[test]
     fn smoke() {
         let (p, c) = Chan::new();
-        do spawn {
+        spawn(proc() {
             c.send(());
-        }
+        });
         p.recv();
     }
 
     #[test]
     fn smoke_fail() {
         let (p, c) = Chan::<()>::new();
-        do spawn {
+        spawn(proc() {
             let _c = c;
             fail!()
-        }
+        });
         assert_eq!(p.recv_opt(), None);
     }
 
@@ -311,38 +311,38 @@ mod tests {
     #[test]
     fn yield_test() {
         let (p, c) = Chan::new();
-        do spawn {
+        spawn(proc() {
             10.times(task::deschedule);
             c.send(());
-        }
+        });
         p.recv();
     }
 
     #[test]
     fn spawn_children() {
         let (p, c) = Chan::new();
-        do spawn {
+        spawn(proc() {
             let (p, c2) = Chan::new();
-            do spawn {
+            spawn(proc() {
                 let (p, c3) = Chan::new();
-                do spawn {
+                spawn(proc() {
                     c3.send(());
-                }
+                });
                 p.recv();
                 c2.send(());
-            }
+            });
             p.recv();
             c.send(());
-        }
+        });
         p.recv();
     }
 
     #[test]
     fn spawn_inherits() {
         let (p, c) = Chan::new();
-        do spawn {
+        spawn(proc() {
             let c = c;
-            do spawn {
+            spawn(proc() {
                 let mut task: ~Task = Local::take();
                 match task.maybe_take_runtime::<Ops>() {
                     Some(ops) => {
@@ -352,8 +352,8 @@ mod tests {
                 }
                 Local::put(task);
                 c.send(());
-            }
-        }
+            });
+        });
         p.recv();
     }
 }