diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-06-30 16:19:07 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-07-01 19:19:32 -0700 |
| commit | d1fc2b5995fdef69fe1dbdbba3703398c0aa547b (patch) | |
| tree | b6d14fd0e920512a29c64a671cc2a5bb90132abb /src/libstd/uv_global_loop.rs | |
| parent | 13a8f545388929a07af110a950441e6a1b88473a (diff) | |
Convert to new closure syntax
Diffstat (limited to 'src/libstd/uv_global_loop.rs')
| -rw-r--r-- | src/libstd/uv_global_loop.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index 6ea7b48ad97..aab8040c0a4 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -40,7 +40,7 @@ fn get_monitor_task_gl() -> iotask unsafe { #debug("ENTERING global_loop::get() loop chan: %?", monitor_loop_chan_ptr); - let builder_fn = {|| + let builder_fn = || { let builder = task::builder(); task::set_opts(builder, { supervise: false, @@ -57,11 +57,11 @@ fn get_monitor_task_gl() -> iotask unsafe { type monchan = chan<iotask>; let monitor_ch = do chan_from_global_ptr::<monchan>(monitor_loop_chan_ptr, - builder_fn) {|msg_po| + builder_fn) |msg_po| { #debug("global monitor task starting"); // As a weak task the runtime will notify us when to exit - do weaken_task() {|weak_exit_po| + do weaken_task() |weak_exit_po| { #debug("global monitor task is now weak"); let hl_loop = spawn_loop(); loop { @@ -87,7 +87,7 @@ fn get_monitor_task_gl() -> iotask unsafe { // once we have a chan to the monitor loop, we ask it for // the libuv loop's async handle - do listen { |fetch_ch| + do listen |fetch_ch| { monitor_ch.send(fetch_ch); fetch_ch.recv() } @@ -95,11 +95,11 @@ fn get_monitor_task_gl() -> iotask unsafe { fn spawn_loop() -> iotask unsafe { let builder = task::builder(); - do task::add_wrapper(builder) {|task_body| + do task::add_wrapper(builder) |task_body| { fn~(move task_body) { // The I/O loop task also needs to be weak so it doesn't keep // the runtime alive - do weaken_task {|weak_exit_po| + do weaken_task |weak_exit_po| { #debug("global libuv task is now weak %?", weak_exit_po); task_body(); @@ -129,7 +129,7 @@ mod test { log(debug, "in simple timer cb"); ll::timer_stop(timer_ptr); let hl_loop = get_gl(); - do iotask::interact(hl_loop) {|_loop_ptr| + do iotask::interact(hl_loop) |_loop_ptr| { log(debug, "closing timer"); ll::close(timer_ptr, simple_timer_close_cb); log(debug, "about to deref exit_ch_ptr"); @@ -146,7 +146,7 @@ mod test { exit_ch_ptr)); let timer_handle = ll::timer_t(); let timer_ptr = ptr::addr_of(timer_handle); - do iotask::interact(iotask) {|loop_ptr| + do iotask::interact(iotask) |loop_ptr| { log(debug, "user code inside interact loop!!!"); let init_status = ll::timer_init(loop_ptr, timer_ptr); if(init_status == 0i32) { @@ -174,7 +174,7 @@ mod test { let hl_loop = get_gl(); let exit_po = comm::port::<()>(); let exit_ch = comm::chan(exit_po); - task::spawn_sched(task::manual_threads(1u), {|| + task::spawn_sched(task::manual_threads(1u), || { impl_uv_hl_simple_timer(hl_loop); comm::send(exit_ch, ()); }); @@ -191,13 +191,13 @@ mod test { let exit_po = comm::port::<()>(); let exit_ch = comm::chan(exit_po); let cycles = 5000u; - do iter::repeat(cycles) {|| - task::spawn_sched(task::manual_threads(1u), {|| + do iter::repeat(cycles) || { + task::spawn_sched(task::manual_threads(1u), || { impl_uv_hl_simple_timer(hl_loop); comm::send(exit_ch, ()); }); }; - do iter::repeat(cycles) {|| + do iter::repeat(cycles) || { comm::recv(exit_po); }; log(debug, "test_stress_gl_uv_global_loop_high_level_global_timer"+ |
