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/timer.rs | |
| parent | 13a8f545388929a07af110a950441e6a1b88473a (diff) | |
| download | rust-d1fc2b5995fdef69fe1dbdbba3703398c0aa547b.tar.gz rust-d1fc2b5995fdef69fe1dbdbba3703398c0aa547b.zip | |
Convert to new closure syntax
Diffstat (limited to 'src/libstd/timer.rs')
| -rw-r--r-- | src/libstd/timer.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index b907944e51a..6365c9bd953 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -31,7 +31,7 @@ fn delayed_send<T: copy send>(iotask: iotask, let timer_done_ch_ptr = ptr::addr_of(timer_done_ch); let timer = uv::ll::timer_t(); let timer_ptr = ptr::addr_of(timer); - do iotask::interact(iotask) {|loop_ptr| + do iotask::interact(iotask) |loop_ptr| { let init_result = uv::ll::timer_init(loop_ptr, timer_ptr); if (init_result == 0i32) { let start_result = uv::ll::timer_start( @@ -105,11 +105,11 @@ fn recv_timeout<T: copy send>(iotask: iotask, delayed_send(iotask, msecs, timeout_ch, ()); // FIXME: This could be written clearer (#2618) either::either( - {|left_val| + |left_val| { log(debug, #fmt("recv_time .. left_val %?", left_val)); none - }, {|right_val| + }, |right_val| { some(right_val) }, comm::select2(timeout_po, wait_po) ) @@ -151,7 +151,7 @@ mod test { #[test] fn test_gl_timer_sleep_stress1() { let hl_loop = uv::global_loop::get(); - do iter::repeat(200u) {|| + do iter::repeat(200u) || { sleep(hl_loop, 1u); } } @@ -171,14 +171,14 @@ mod test { }; - do iter::repeat(repeat) {|| + do iter::repeat(repeat) || { - for spec.each {|spec| + for spec.each |spec| { let (times, maxms) = spec; - do task::spawn {|| + do task::spawn || { import rand::*; let rng = rng(); - do iter::repeat(times) {|| + do iter::repeat(times) || { sleep(hl_loop, rng.next() as uint % maxms); } comm::send(ch, ()); @@ -186,7 +186,7 @@ mod test { } } - do iter::repeat(repeat * spec.len()) {|| + do iter::repeat(repeat * spec.len()) || { comm::recv(po) } } @@ -204,14 +204,14 @@ mod test { let mut failures = 0; let hl_loop = uv::global_loop::get(); - do iter::repeat(times as uint) {|| + do iter::repeat(times as uint) || { task::yield(); let expected = rand::rng().gen_str(16u); let test_po = comm::port::<str>(); let test_ch = comm::chan(test_po); - do task::spawn() {|| + do task::spawn() || { delayed_send(hl_loop, 1u, test_ch, expected); }; @@ -231,12 +231,12 @@ mod test { let mut failures = 0; let hl_loop = uv::global_loop::get(); - do iter::repeat(times as uint) {|| + do iter::repeat(times as uint) || { let expected = rand::rng().gen_str(16u); let test_po = comm::port::<str>(); let test_ch = comm::chan(test_po); - do task::spawn() {|| + do task::spawn() || { delayed_send(hl_loop, 1000u, test_ch, expected); }; |
