diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-26 15:46:12 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:47:37 -0500 |
| commit | 7d661af9c86566088f7dbaeee25143ecde673b75 (patch) | |
| tree | 54aa9b410d06064bdc893f034e1b86921698aea9 /src/libstd/sync/mpsc | |
| parent | c300d681bd2e901ef39591bbfb1ea4568ac6be70 (diff) | |
| download | rust-7d661af9c86566088f7dbaeee25143ecde673b75.tar.gz rust-7d661af9c86566088f7dbaeee25143ecde673b75.zip | |
`for x in range(a, b)` -> `for x in a..b`
sed -i 's/in range(\([^,]*\), *\([^()]*\))/in \1\.\.\2/g' **/*.rs
Diffstat (limited to 'src/libstd/sync/mpsc')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 54 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mpsc_queue.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/select.rs | 20 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/spsc_queue.rs | 4 |
4 files changed, 42 insertions, 42 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 322c6137984..29ab7979e04 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -74,14 +74,14 @@ //! // where tx is the sending half (tx for transmission), and rx is the receiving //! // half (rx for receiving). //! let (tx, rx) = channel(); -//! for i in range(0i, 10i) { +//! for i in 0i..10i { //! let tx = tx.clone(); //! Thread::spawn(move|| { //! tx.send(i).unwrap(); //! }); //! } //! -//! for _ in range(0i, 10i) { +//! for _ in 0i..10i { //! let j = rx.recv().unwrap(); //! assert!(0 <= j && j < 10); //! } @@ -1147,9 +1147,9 @@ mod test { fn stress() { let (tx, rx) = channel::<int>(); let t = Thread::scoped(move|| { - for _ in range(0u, 10000) { tx.send(1i).unwrap(); } + for _ in 0u..10000 { tx.send(1i).unwrap(); } }); - for _ in range(0u, 10000) { + for _ in 0u..10000 { assert_eq!(rx.recv().unwrap(), 1); } t.join().ok().unwrap(); @@ -1162,7 +1162,7 @@ mod test { let (tx, rx) = channel::<int>(); let t = Thread::scoped(move|| { - for _ in range(0, AMT * NTHREADS) { + for _ in 0..AMT * NTHREADS { assert_eq!(rx.recv().unwrap(), 1); } match rx.try_recv() { @@ -1171,10 +1171,10 @@ mod test { } }); - for _ in range(0, NTHREADS) { + for _ in 0..NTHREADS { let tx = tx.clone(); Thread::spawn(move|| { - for _ in range(0, AMT) { tx.send(1).unwrap(); } + for _ in 0..AMT { tx.send(1).unwrap(); } }); } drop(tx); @@ -1187,13 +1187,13 @@ mod test { let (tx2, rx2) = channel::<int>(); let t1 = Thread::scoped(move|| { tx1.send(()).unwrap(); - for _ in range(0i, 40) { + for _ in 0i..40 { assert_eq!(rx2.recv().unwrap(), 1); } }); rx1.recv().unwrap(); let t2 = Thread::scoped(move|| { - for _ in range(0i, 40) { + for _ in 0i..40 { tx2.send(1).unwrap(); } }); @@ -1205,11 +1205,11 @@ mod test { fn recv_from_outside_runtime() { let (tx, rx) = channel::<int>(); let t = Thread::scoped(move|| { - for _ in range(0i, 40) { + for _ in 0i..40 { assert_eq!(rx.recv().unwrap(), 1); } }); - for _ in range(0u, 40) { + for _ in 0u..40 { tx.send(1).unwrap(); } t.join().ok().unwrap(); @@ -1429,22 +1429,22 @@ mod test { fn recv_a_lot() { // Regression test that we don't run out of stack in scheduler context let (tx, rx) = channel(); - for _ in range(0i, 10000) { tx.send(()).unwrap(); } - for _ in range(0i, 10000) { rx.recv().unwrap(); } + for _ in 0i..10000 { tx.send(()).unwrap(); } + for _ in 0i..10000 { rx.recv().unwrap(); } } #[test] fn shared_chan_stress() { let (tx, rx) = channel(); let total = stress_factor() + 100; - for _ in range(0, total) { + for _ in 0..total { let tx = tx.clone(); Thread::spawn(move|| { tx.send(()).unwrap(); }); } - for _ in range(0, total) { + for _ in 0..total { rx.recv().unwrap(); } } @@ -1530,7 +1530,7 @@ mod test { tx2.send(()).unwrap(); }); // make sure the other task has gone to sleep - for _ in range(0u, 5000) { Thread::yield_now(); } + for _ in 0u..5000 { Thread::yield_now(); } // upgrade to a shared chan and send a message let t = tx.clone(); @@ -1654,9 +1654,9 @@ mod sync_tests { fn stress() { let (tx, rx) = sync_channel::<int>(0); Thread::spawn(move|| { - for _ in range(0u, 10000) { tx.send(1).unwrap(); } + for _ in 0u..10000 { tx.send(1).unwrap(); } }); - for _ in range(0u, 10000) { + for _ in 0u..10000 { assert_eq!(rx.recv().unwrap(), 1); } } @@ -1669,7 +1669,7 @@ mod sync_tests { let (dtx, drx) = sync_channel::<()>(0); Thread::spawn(move|| { - for _ in range(0, AMT * NTHREADS) { + for _ in 0..AMT * NTHREADS { assert_eq!(rx.recv().unwrap(), 1); } match rx.try_recv() { @@ -1679,10 +1679,10 @@ mod sync_tests { dtx.send(()).unwrap(); }); - for _ in range(0, NTHREADS) { + for _ in 0..NTHREADS { let tx = tx.clone(); Thread::spawn(move|| { - for _ in range(0, AMT) { tx.send(1).unwrap(); } + for _ in 0..AMT { tx.send(1).unwrap(); } }); } drop(tx); @@ -1893,22 +1893,22 @@ mod sync_tests { fn recv_a_lot() { // Regression test that we don't run out of stack in scheduler context let (tx, rx) = sync_channel(10000); - for _ in range(0u, 10000) { tx.send(()).unwrap(); } - for _ in range(0u, 10000) { rx.recv().unwrap(); } + for _ in 0u..10000 { tx.send(()).unwrap(); } + for _ in 0u..10000 { rx.recv().unwrap(); } } #[test] fn shared_chan_stress() { let (tx, rx) = sync_channel(0); let total = stress_factor() + 100; - for _ in range(0, total) { + for _ in 0..total { let tx = tx.clone(); Thread::spawn(move|| { tx.send(()).unwrap(); }); } - for _ in range(0, total) { + for _ in 0..total { rx.recv().unwrap(); } } @@ -1994,7 +1994,7 @@ mod sync_tests { tx2.send(()).unwrap(); }); // make sure the other task has gone to sleep - for _ in range(0u, 5000) { Thread::yield_now(); } + for _ in 0u..5000 { Thread::yield_now(); } // upgrade to a shared chan and send a message let t = tx.clone(); @@ -2082,7 +2082,7 @@ mod sync_tests { rx2.recv().unwrap(); } - for _ in range(0u, 100) { + for _ in 0u..100 { repro() } } diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index c222c313ba6..53eba131674 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -181,11 +181,11 @@ mod tests { let (tx, rx) = channel(); let q = Arc::new(q); - for _ in range(0, nthreads) { + for _ in 0..nthreads { let tx = tx.clone(); let q = q.clone(); Thread::spawn(move|| { - for i in range(0, nmsgs) { + for i in 0..nmsgs { q.push(i); } tx.send(()).unwrap(); @@ -200,7 +200,7 @@ mod tests { } } drop(tx); - for _ in range(0, nthreads) { + for _ in 0..nthreads { rx.recv().unwrap(); } } diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index e97c82a5b1b..f70e2dee8ee 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -421,10 +421,10 @@ mod test { let (tx3, rx3) = channel::<int>(); let _t = Thread::spawn(move|| { - for _ in range(0u, 20) { Thread::yield_now(); } + for _ in 0u..20 { Thread::yield_now(); } tx1.send(1).unwrap(); rx3.recv().unwrap(); - for _ in range(0u, 20) { Thread::yield_now(); } + for _ in 0u..20 { Thread::yield_now(); } }); select! { @@ -445,7 +445,7 @@ mod test { let (tx3, rx3) = channel::<()>(); let _t = Thread::spawn(move|| { - for _ in range(0u, 20) { Thread::yield_now(); } + for _ in 0u..20 { Thread::yield_now(); } tx1.send(1).unwrap(); tx2.send(2).unwrap(); rx3.recv().unwrap(); @@ -472,7 +472,7 @@ mod test { let (tx3, rx3) = channel::<()>(); let _t = Thread::spawn(move|| { - for i in range(0, AMT) { + for i in 0..AMT { if i % 2 == 0 { tx1.send(i).unwrap(); } else { @@ -482,7 +482,7 @@ mod test { } }); - for i in range(0, AMT) { + for i in 0..AMT { select! { i1 = rx1.recv() => { assert!(i % 2 == 0 && i == i1.unwrap()); }, i2 = rx2.recv() => { assert!(i % 2 == 1 && i == i2.unwrap()); } @@ -550,7 +550,7 @@ mod test { tx3.send(()).unwrap(); }); - for _ in range(0u, 1000) { Thread::yield_now(); } + for _ in 0u..1000 { Thread::yield_now(); } drop(tx1.clone()); tx2.send(()).unwrap(); rx3.recv().unwrap(); @@ -663,7 +663,7 @@ mod test { tx2.send(()).unwrap(); }); - for _ in range(0u, 100) { Thread::yield_now() } + for _ in 0u..100 { Thread::yield_now() } tx1.send(()).unwrap(); rx2.recv().unwrap(); } @@ -683,7 +683,7 @@ mod test { tx2.send(()).unwrap(); }); - for _ in range(0u, 100) { Thread::yield_now() } + for _ in 0u..100 { Thread::yield_now() } tx1.send(()).unwrap(); rx2.recv().unwrap(); } @@ -702,7 +702,7 @@ mod test { tx2.send(()).unwrap(); }); - for _ in range(0u, 100) { Thread::yield_now() } + for _ in 0u..100 { Thread::yield_now() } tx1.send(()).unwrap(); rx2.recv().unwrap(); } @@ -720,7 +720,7 @@ mod test { fn sync2() { let (tx, rx) = sync_channel::<int>(0); let _t = Thread::spawn(move|| { - for _ in range(0u, 100) { Thread::yield_now() } + for _ in 0u..100 { Thread::yield_now() } tx.send(1).unwrap(); }); select! { diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index c1983fcab19..45503f0b58e 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -325,7 +325,7 @@ mod test { let (tx, rx) = channel(); let q2 = q.clone(); let _t = Thread::spawn(move|| { - for _ in range(0u, 100000) { + for _ in 0u..100000 { loop { match q2.pop() { Some(1i) => break, @@ -336,7 +336,7 @@ mod test { } tx.send(()).unwrap(); }); - for _ in range(0i, 100000) { + for _ in 0i..100000 { q.push(1); } rx.recv().unwrap(); |
