test: Remove non-procedure uses of `do` from compiletest, libstd tests,

compile-fail tests, run-fail tests, and run-pass tests.

7 files changed, 40 insertions, 40 deletions

diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs
index e3e425f620b..52a6d67cb05 100644
--- a/src/libstd/rt/comm.rs
+++ b/src/libstd/rt/comm.rs
@@ -1013,7 +1013,7 @@ mod test {
 
             total.times(|| {
                 port.recv();
-            })
+            });
         }
     }
 
@@ -1041,7 +1041,7 @@ mod test {
 
             total.times(|| {
                 end_port.recv();
-            })
+            });
         }
     }
 
@@ -1071,7 +1071,7 @@ mod test {
                     do spawntask_random {
                         chan_clone.send(());
                     }
-                })
+                });
             }
             let end_chan_clone = end_chan.clone();
             do spawntask_random {
@@ -1082,7 +1082,7 @@ mod test {
                         let recvd = port_clone.try_recv().is_some();
                         end_chan_clone.send(recvd);
                     }
-                })
+                });
             }
 
             let mut recvd = 0;
@@ -1112,12 +1112,12 @@ mod test {
                 let pipe_clone = pipe.clone();
                 let end_chan_clone = end_chan.clone();
                 do spawntask_random {
-                    do msgs.times {
+                    msgs.times(|| {
                         pipe_clone.send(());
-                    }
-                    do msgs.times {
+                    });
+                    msgs.times(|| {
                         pipe_clone.recv();
-                    }
+                    });
                 }
 
                 end_chan_clone.send(());
@@ -1125,7 +1125,7 @@ mod test {
 
             total.times(|| {
                 end_port.recv();
-            })
+            });
         }
     }
 
diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs
index 76ccacb331f..6dcbd4a129e 100644
--- a/src/libstd/rt/crate_map.rs
+++ b/src/libstd/rt/crate_map.rs
@@ -61,9 +61,9 @@ pub fn get_crate_map() -> Option<&'static CrateMap<'static>> {
         } else {
             "_rust_crate_map_toplevel"
         };
-        let sym = do rust_crate_map_toplevel.with_c_str |buf| {
+        let sym = rust_crate_map_toplevel.with_c_str(|buf| {
             dl::symbol(module, buf)
-        };
+        });
         dl::close(module);
         sym
     };
@@ -141,10 +141,10 @@ mod tests {
 
         let mut cnt = 0;
         unsafe {
-            do iter_crate_map(&root_crate) |entry| {
+            iter_crate_map(&root_crate, |entry| {
                 assert!(*entry.log_level == 3);
                 cnt += 1;
-            }
+            });
             assert!(cnt == 1);
         }
     }
@@ -183,10 +183,10 @@ mod tests {
 
         let mut cnt = 0;
         unsafe {
-            do iter_crate_map(&root_crate) |entry| {
+            iter_crate_map(&root_crate, |entry| {
                 assert!(*entry.log_level == cnt);
                 cnt += 1;
-            }
+            });
             assert!(cnt == 4);
         }
     }
diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs
index 08d111da351..3147e3c8a07 100644
--- a/src/libstd/rt/global_heap.rs
+++ b/src/libstd/rt/global_heap.rs
@@ -103,15 +103,15 @@ mod bench {
 
     #[bench]
     fn alloc_owned_small(bh: &mut BenchHarness) {
-        do bh.iter {
+        bh.iter(|| {
             ~10;
-        }
+        })
     }
 
     #[bench]
     fn alloc_owned_big(bh: &mut BenchHarness) {
-        do bh.iter {
+        bh.iter(|| {
             ~[10, ..1000];
-        }
+        })
     }
 }
diff --git a/src/libstd/rt/local.rs b/src/libstd/rt/local.rs
index 23345926543..d5b0e384ca2 100644
--- a/src/libstd/rt/local.rs
+++ b/src/libstd/rt/local.rs
@@ -182,9 +182,9 @@ mod test {
             let task = ~Task::new_root(&mut sched.stack_pool, None, || {});
             Local::put(task);
 
-            let res = do Local::borrow |_task: &mut Task| {
+            let res = Local::borrow(|_task: &mut Task| {
                 true
-            };
+            });
             assert!(res)
                 let task: ~Task = Local::take();
             cleanup_task(task);
diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs
index a7805a9f559..c98a66453eb 100644
--- a/src/libstd/rt/local_heap.rs
+++ b/src/libstd/rt/local_heap.rs
@@ -311,11 +311,11 @@ mod bench {
 
     #[bench]
     fn alloc_managed_small(bh: &mut BenchHarness) {
-        bh.iter(|| @10);
+        bh.iter(|| { @10; });
     }
 
     #[bench]
     fn alloc_managed_big(bh: &mut BenchHarness) {
-        bh.iter(|| @[10, ..1000]);
+        bh.iter(|| { @[10, ..1000]; });
     }
 }
diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs
index 519274bb131..ccc786242e6 100644
--- a/src/libstd/rt/sched.rs
+++ b/src/libstd/rt/sched.rs
@@ -1176,7 +1176,7 @@ mod test {
         use util;
 
         do run_in_bare_thread {
-            do stress_factor().times {
+            stress_factor().times(|| {
                 let sleepers = SleeperList::new();
                 let queue = WorkQueue::new();
                 let queues = ~[queue.clone()];
@@ -1205,7 +1205,7 @@ mod test {
                 util::ignore(handle);
 
                 thread.join();
-            }
+            })
         }
     }
 
@@ -1218,14 +1218,14 @@ mod test {
 
         do run_in_mt_newsched_task {
             let mut ports = ~[];
-            do 10.times {
+            10.times(|| {
                 let (port, chan) = oneshot();
                 let chan_cell = Cell::new(chan);
                 do spawntask_later {
                     chan_cell.take().send(());
                 }
                 ports.push(port);
-            }
+            });
 
             while !ports.is_empty() {
                 ports.pop().recv();
@@ -1315,7 +1315,7 @@ mod test {
     fn dont_starve_1() {
         use rt::comm::oneshot;
 
-        do stress_factor().times {
+        stress_factor().times(|| {
             do run_in_mt_newsched_task {
                 let (port, chan) = oneshot();
 
@@ -1327,14 +1327,14 @@ mod test {
 
                 chan.send(());
             }
-        }
+        })
     }
 
     #[test]
     fn dont_starve_2() {
         use rt::comm::oneshot;
 
-        do stress_factor().times {
+        stress_factor().times(|| {
             do run_in_newsched_task {
                 let (port, chan) = oneshot();
                 let (_port2, chan2) = stream();
@@ -1349,7 +1349,7 @@ mod test {
 
                 chan.send(());
             }
-        }
+        })
     }
 
     // Regression test for a logic bug that would cause single-threaded schedulers
@@ -1360,7 +1360,7 @@ mod test {
         use num::Times;
 
         do spawn_sched(SingleThreaded) {
-            do 5.times { deschedule(); }
+            5.times(|| { deschedule(); })
         }
         do spawn { }
         do spawn { }
diff --git a/src/libstd/rt/tube.rs b/src/libstd/rt/tube.rs
index 360764daf15..0d4171d5a64 100644
--- a/src/libstd/rt/tube.rs
+++ b/src/libstd/rt/tube.rs
@@ -103,11 +103,11 @@ mod test {
             let tube_clone = tube.clone();
             let tube_clone_cell = Cell::new(tube_clone);
             let sched: ~Scheduler = Local::take();
-            do sched.deschedule_running_task_and_then |sched, task| {
+            sched.deschedule_running_task_and_then(|sched, task| {
                 let mut tube_clone = tube_clone_cell.take();
                 tube_clone.send(1);
                 sched.enqueue_blocked_task(task);
-            }
+            });
 
             assert!(tube.recv() == 1);
         }
@@ -120,7 +120,7 @@ mod test {
             let tube_clone = tube.clone();
             let tube_clone = Cell::new(tube_clone);
             let sched: ~Scheduler = Local::take();
-            do sched.deschedule_running_task_and_then |sched, task| {
+            sched.deschedule_running_task_and_then(|sched, task| {
                 let tube_clone = Cell::new(tube_clone.take());
                 do sched.event_loop.callback {
                     let mut tube_clone = tube_clone.take();
@@ -129,7 +129,7 @@ mod test {
                     tube_clone.send(1);
                 }
                 sched.enqueue_blocked_task(task);
-            }
+            });
 
             assert!(tube.recv() == 1);
         }
@@ -144,14 +144,14 @@ mod test {
             let tube_clone = tube.clone();
             let tube_clone = Cell::new(tube_clone);
             let sched: ~Scheduler = Local::take();
-            do sched.deschedule_running_task_and_then |sched, task| {
+            sched.deschedule_running_task_and_then(|sched, task| {
                 callback_send(tube_clone.take(), 0);
 
                 fn callback_send(tube: Tube<int>, i: int) {
                     if i == 100 { return; }
 
                     let tube = Cell::new(Cell::new(tube));
-                    do Local::borrow |sched: &mut Scheduler| {
+                    Local::borrow(|sched: &mut Scheduler| {
                         let tube = tube.take();
                         do sched.event_loop.callback {
                             let mut tube = tube.take();
@@ -160,11 +160,11 @@ mod test {
                             tube.send(i);
                             callback_send(tube, i + 1);
                         }
-                    }
+                    })
                 }
 
                 sched.enqueue_blocked_task(task);
-            }
+            });
 
             for i in range(0, MAX) {
                 let j = tube.recv();