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 | |
| 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')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 50 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 4 | ||||
| -rw-r--r-- | src/libstd/old_io/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/mem.rs | 8 | ||||
| -rw-r--r-- | src/libstd/old_io/net/pipe.rs | 12 | ||||
| -rw-r--r-- | src/libstd/old_io/net/tcp.rs | 14 | ||||
| -rw-r--r-- | src/libstd/old_io/net/udp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/tempfile.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/timer.rs | 6 | ||||
| -rw-r--r-- | src/libstd/os.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand/mod.rs | 16 | ||||
| -rw-r--r-- | src/libstd/rand/os.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sync/barrier.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync/condvar.rs | 4 | ||||
| -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 | ||||
| -rw-r--r-- | src/libstd/sync/mutex.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sync/once.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync/rwlock.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sync/task_pool.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 2 |
24 files changed, 128 insertions, 128 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 27e5295d2c8..f5937e5f902 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -89,7 +89,7 @@ impl DefaultResizePolicy { fn test_resize_policy() { use prelude::v1::*; let rp = DefaultResizePolicy; - for n in range(0u, 1000) { + for n in 0u..1000 { assert!(rp.min_capacity(rp.usable_capacity(n)) <= n); assert!(rp.usable_capacity(rp.min_capacity(n)) <= n); } @@ -1681,24 +1681,24 @@ mod test_map { let mut m = HashMap::new(); DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 0); } }); - for i in range(0u, 100) { + for i in 0u..100 { let d1 = Dropable::new(i); let d2 = Dropable::new(i+100); m.insert(d1, d2); } DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 1); } }); - for i in range(0u, 50) { + for i in 0u..50 { let k = Dropable::new(i); let v = m.remove(&k); @@ -1711,12 +1711,12 @@ mod test_map { } DROP_VECTOR.with(|v| { - for i in range(0u, 50) { + for i in 0u..50 { assert_eq!(v.borrow()[i], 0); assert_eq!(v.borrow()[i+100], 0); } - for i in range(50u, 100) { + for i in 50u..100 { assert_eq!(v.borrow()[i], 1); assert_eq!(v.borrow()[i+100], 1); } @@ -1724,7 +1724,7 @@ mod test_map { } DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 0); } }); @@ -1740,19 +1740,19 @@ mod test_map { let mut hm = HashMap::new(); DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 0); } }); - for i in range(0u, 100) { + for i in 0u..100 { let d1 = Dropable::new(i); let d2 = Dropable::new(i+100); hm.insert(d1, d2); } DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 1); } }); @@ -1767,7 +1767,7 @@ mod test_map { let mut half = hm.into_iter().take(50); DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 1); } }); @@ -1789,7 +1789,7 @@ mod test_map { }; DROP_VECTOR.with(|v| { - for i in range(0u, 200) { + for i in 0u..200 { assert_eq!(v.borrow()[i], 0); } }); @@ -1807,7 +1807,7 @@ mod test_map { // Try this a few times to make sure we never screw up the hashmap's // internal state. - for _ in range(0i, 10) { + for _ in 0i..10 { assert!(m.is_empty()); for i in range_inclusive(1i, 1000) { @@ -1934,7 +1934,7 @@ mod test_map { #[test] fn test_iterate() { let mut m = HashMap::with_capacity(4); - for i in range(0u, 32) { + for i in 0u..32 { assert!(m.insert(i, i*2).is_none()); } assert_eq!(m.len(), 32); @@ -2050,7 +2050,7 @@ mod test_map { assert_eq!(cap, initial_cap * 2); let mut i = 0u; - for _ in range(0, cap * 3 / 4) { + for _ in 0..cap * 3 / 4 { m.insert(i, i); i += 1; } @@ -2059,7 +2059,7 @@ mod test_map { assert_eq!(m.len(), i); assert_eq!(m.table.capacity(), cap); - for _ in range(0, cap / 4) { + for _ in 0..cap / 4 { m.insert(i, i); i += 1; } @@ -2068,7 +2068,7 @@ mod test_map { let new_cap = m.table.capacity(); assert_eq!(new_cap, cap * 2); - for _ in range(0, cap / 2 - 1) { + for _ in 0..cap / 2 - 1 { i -= 1; m.remove(&i); assert_eq!(m.table.capacity(), new_cap); @@ -2077,7 +2077,7 @@ mod test_map { m.shrink_to_fit(); assert_eq!(m.table.capacity(), cap); // again, a little more than half full - for _ in range(0, cap / 2 - 1) { + for _ in 0..cap / 2 - 1 { i -= 1; m.remove(&i); } @@ -2094,18 +2094,18 @@ mod test_map { m.insert(0u, 0u); m.remove(&0); assert!(m.capacity() >= m.len()); - for i in range(0, 128) { + for i in 0..128 { m.insert(i, i); } m.reserve(256); let usable_cap = m.capacity(); - for i in range(128, 128+256) { + for i in 128..128+256 { m.insert(i, i); assert_eq!(m.capacity(), usable_cap); } - for i in range(100, 128+256) { + for i in 100..128+256 { assert_eq!(m.remove(&i), Some(i)); } m.shrink_to_fit(); @@ -2114,7 +2114,7 @@ mod test_map { assert!(!m.is_empty()); assert!(m.capacity() >= m.len()); - for i in range(0, 100) { + for i in 0..100 { assert_eq!(m.remove(&i), Some(i)); } m.shrink_to_fit(); @@ -2277,12 +2277,12 @@ mod test_map { let mut rng = weak_rng(); // Populate the map with some items. - for _ in range(0u, 50) { + for _ in 0u..50 { let x = rng.gen_range(-10, 10); m.insert(x, ()); } - for i in range(0u, 1000) { + for i in 0u..1000 { let x = rng.gen_range(-10, 10); match m.entry(x) { Vacant(_) => {}, diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index dc16fd88201..ad0cb3c1a7a 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -1003,7 +1003,7 @@ mod test_set { #[test] fn test_iterate() { let mut a = HashSet::new(); - for i in range(0u, 32) { + for i in 0u..32 { assert!(a.insert(i)); } let mut observed: u32 = 0; @@ -1201,7 +1201,7 @@ mod test_set { let mut s: HashSet<int> = (1..100).collect(); // try this a bunch of times to make sure we don't screw up internal state. - for _ in range(0i, 20) { + for _ in 0i..20 { assert_eq!(s.len(), 99); { diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index 5a4ce24be0d..99c7e399b1c 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -1101,7 +1101,7 @@ mod test { let dir = &tmpdir.join("di_readdir"); check!(mkdir(dir, old_io::USER_RWX)); let prefix = "foo"; - for n in range(0i,3) { + for n in 0i..3 { let f = dir.join(format!("{}.txt", n)); let mut w = check!(File::create(&f)); let msg_str = format!("{}{}", prefix, n.to_string()); diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs index 750bc50288a..ddb364a703a 100644 --- a/src/libstd/old_io/mem.rs +++ b/src/libstd/old_io/mem.rs @@ -663,7 +663,7 @@ mod test { b.bytes = (times * len) as u64; b.iter(|| { let mut wr = MemWriter::new(); - for _ in range(0, times) { + for _ in 0..times { wr.write(src.as_slice()).unwrap(); } @@ -719,7 +719,7 @@ mod test { let buf = [5 as u8; 100].to_vec(); { let mut rdr = MemReader::new(buf); - for _i in range(0u, 10) { + for _i in 0u..10 { let mut buf = [0 as u8; 10]; rdr.read(&mut buf).unwrap(); assert_eq!(buf.as_slice(), [5; 10].as_slice()); @@ -734,7 +734,7 @@ mod test { let mut buf = [0 as u8; 100]; { let mut wr = BufWriter::new(&mut buf); - for _i in range(0u, 10) { + for _i in 0u..10 { wr.write(&[5; 10]).unwrap(); } } @@ -748,7 +748,7 @@ mod test { let buf = [5 as u8; 100]; { let mut rdr = BufReader::new(&buf); - for _i in range(0u, 10) { + for _i in 0u..10 { let mut buf = [0 as u8; 10]; rdr.read(&mut buf).unwrap(); assert_eq!(buf, [5; 10]); diff --git a/src/libstd/old_io/net/pipe.rs b/src/libstd/old_io/net/pipe.rs index 71b77adcd96..0da7670c5b4 100644 --- a/src/libstd/old_io/net/pipe.rs +++ b/src/libstd/old_io/net/pipe.rs @@ -390,7 +390,7 @@ mod tests { }; let _t = Thread::spawn(move|| { - for _ in range(0u, times) { + for _ in 0u..times { let mut stream = UnixStream::connect(&path2); match stream.write(&[100]) { Ok(..) => {} @@ -399,7 +399,7 @@ mod tests { } }); - for _ in range(0, times) { + for _ in 0..times { let mut client = acceptor.accept(); let mut buf = [0]; match client.read(&mut buf) { @@ -555,7 +555,7 @@ mod tests { tx.send(UnixStream::connect(&addr2).unwrap()).unwrap(); }); let l = rx.recv().unwrap(); - for i in range(0u, 1001) { + for i in 0u..1001 { match a.accept() { Ok(..) => break, Err(ref e) if e.kind == TimedOut => {} @@ -683,7 +683,7 @@ mod tests { assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut); s.set_timeout(Some(20)); - for i in range(0u, 1001) { + for i in 0u..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -727,7 +727,7 @@ mod tests { assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut); tx.send(()).unwrap(); - for _ in range(0u, 100) { + for _ in 0u..100 { assert!(s.write(&[0;128 * 1024]).is_ok()); } } @@ -746,7 +746,7 @@ mod tests { let mut s = a.accept().unwrap(); s.set_write_timeout(Some(20)); - for i in range(0u, 1001) { + for i in 0u..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, diff --git a/src/libstd/old_io/net/tcp.rs b/src/libstd/old_io/net/tcp.rs index 1e76bb3ab0d..e0feaa4e558 100644 --- a/src/libstd/old_io/net/tcp.rs +++ b/src/libstd/old_io/net/tcp.rs @@ -748,7 +748,7 @@ mod test { let mut acceptor = TcpListener::bind(addr).listen(); let _t = Thread::spawn(move|| { - for _ in range(0, max) { + for _ in 0..max { let mut stream = TcpStream::connect(addr); stream.write(&[99]).unwrap(); } @@ -768,7 +768,7 @@ mod test { let mut acceptor = TcpListener::bind(addr).listen(); let _t = Thread::spawn(move|| { - for _ in range(0, max) { + for _ in 0..max { let mut stream = TcpStream::connect(addr); stream.write(&[99]).unwrap(); } @@ -1160,7 +1160,7 @@ mod test { tx.send(TcpStream::connect(addr).unwrap()).unwrap(); }); let _l = rx.recv().unwrap(); - for i in range(0i, 1001) { + for i in 0i..1001 { match a.accept() { Ok(..) => break, Err(ref e) if e.kind == TimedOut => {} @@ -1260,7 +1260,7 @@ mod test { assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut); s.set_timeout(Some(20)); - for i in range(0i, 1001) { + for i in 0i..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -1299,7 +1299,7 @@ mod test { assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut); tx.send(()).unwrap(); - for _ in range(0i, 100) { + for _ in 0i..100 { assert!(s.write(&[0;128 * 1024]).is_ok()); } } @@ -1318,7 +1318,7 @@ mod test { let mut s = a.accept().unwrap(); s.set_write_timeout(Some(20)); - for i in range(0i, 1001) { + for i in 0i..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -1388,7 +1388,7 @@ mod test { }); // Try to ensure that the reading clone is indeed reading - for _ in range(0i, 50) { + for _ in 0i..50 { ::thread::Thread::yield_now(); } diff --git a/src/libstd/old_io/net/udp.rs b/src/libstd/old_io/net/udp.rs index de0752b3619..5f1089bc63b 100644 --- a/src/libstd/old_io/net/udp.rs +++ b/src/libstd/old_io/net/udp.rs @@ -448,7 +448,7 @@ mod test { let _b = UdpSocket::bind(addr2).unwrap(); a.set_write_timeout(Some(1000)); - for _ in range(0u, 100) { + for _ in 0u..100 { match a.send_to(&[0;4*1024], addr2) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs index 78910882467..e6037d12c28 100644 --- a/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs @@ -1142,7 +1142,7 @@ mod tests { fn test_zero() { let mut p = sleeper(); p.signal_kill().unwrap(); - for _ in range(0i, 20) { + for _ in 0i..20 { if p.signal(0).is_err() { assert!(!p.wait().unwrap().success()); return diff --git a/src/libstd/old_io/tempfile.rs b/src/libstd/old_io/tempfile.rs index 029fef7c197..88d4e5aa058 100644 --- a/src/libstd/old_io/tempfile.rs +++ b/src/libstd/old_io/tempfile.rs @@ -102,7 +102,7 @@ impl TempDir { } let mut rng = thread_rng(); - for _ in range(0, NUM_RETRIES) { + for _ in 0..NUM_RETRIES { let suffix: String = rng.gen_ascii_chars().take(NUM_RAND_CHARS).collect(); let leaf = if prefix.len() > 0 { format!("{}.{}", prefix, suffix) diff --git a/src/libstd/old_io/timer.rs b/src/libstd/old_io/timer.rs index 7e15c9ad7fc..35f0bcb21d9 100644 --- a/src/libstd/old_io/timer.rs +++ b/src/libstd/old_io/timer.rs @@ -121,7 +121,7 @@ impl Timer { /// let mut timer = Timer::new().unwrap(); /// let ten_milliseconds = timer.oneshot(Duration::milliseconds(10)); /// - /// for _ in range(0u, 100) { /* do work */ } + /// for _ in 0u..100 { /* do work */ } /// /// // blocks until 10 ms after the `oneshot` call /// ten_milliseconds.recv().unwrap(); @@ -173,12 +173,12 @@ impl Timer { /// let mut timer = Timer::new().unwrap(); /// let ten_milliseconds = timer.periodic(Duration::milliseconds(10)); /// - /// for _ in range(0u, 100) { /* do work */ } + /// for _ in 0u..100 { /* do work */ } /// /// // blocks until 10 ms after the `periodic` call /// ten_milliseconds.recv().unwrap(); /// - /// for _ in range(0u, 100) { /* do work */ } + /// for _ in 0u..100 { /* do work */ } /// /// // blocks until 20 ms after the `periodic` call (*not* 10ms after the /// // previous `recv`) diff --git a/src/libstd/os.rs b/src/libstd/os.rs index a347b4c0665..fc5ac861b30 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -643,7 +643,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> { // In general it looks like: // res = Vec::new() // let args = [[NSProcessInfo processInfo] arguments] -// for i in range(0, [args count]) +// for i in 0..[args count] // res.push([args objectAtIndex:i]) // res #[cfg(target_os = "ios")] @@ -679,7 +679,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> { let args = objc_msgSend(info, argumentsSel); let cnt: int = mem::transmute(objc_msgSend(args, countSel)); - for i in range(0, cnt) { + for i in 0..cnt { let tmp = objc_msgSend(args, objectAtSel, i); let utf_c_str: *const libc::c_char = mem::transmute(objc_msgSend(tmp, utf8Sel)); diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 7193d4438e5..a27c217f86d 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -102,7 +102,7 @@ //! let total = 1_000_000; //! let mut in_circle = 0; //! -//! for _ in range(0, total) { +//! for _ in 0u..total { //! let a = between.ind_sample(&mut rng); //! let b = between.ind_sample(&mut rng); //! if a*a + b*b <= 1. { @@ -190,7 +190,7 @@ //! let (mut keep_wins, mut keep_losses) = (0, 0); //! //! println!("Running {} simulations...", num_simulations); -//! for _ in range(0, num_simulations) { +//! for _ in 0..num_simulations { //! let result = simulate(&random_door, &mut rng); //! //! match (result.win, result.switch) { @@ -480,14 +480,14 @@ mod test { #[test] fn test_gen_range() { let mut r = thread_rng(); - for _ in range(0, 1000) { + for _ in 0u..1000 { let a = r.gen_range(-3i, 42); assert!(a >= -3 && a < 42); assert_eq!(r.gen_range(0i, 1), 0); assert_eq!(r.gen_range(-12i, -11), -12); } - for _ in range(0, 1000) { + for _ in 0u..1000 { let a = r.gen_range(10i, 42); assert!(a >= 10 && a < 42); assert_eq!(r.gen_range(0i, 1), 0); @@ -652,7 +652,7 @@ mod bench { fn rand_xorshift(b: &mut Bencher) { let mut rng: XorShiftRng = OsRng::new().unwrap().gen(); b.iter(|| { - for _ in range(0, RAND_BENCH_N) { + for _ in 0..RAND_BENCH_N { rng.gen::<uint>(); } }); @@ -663,7 +663,7 @@ mod bench { fn rand_isaac(b: &mut Bencher) { let mut rng: IsaacRng = OsRng::new().unwrap().gen(); b.iter(|| { - for _ in range(0, RAND_BENCH_N) { + for _ in 0..RAND_BENCH_N { rng.gen::<uint>(); } }); @@ -674,7 +674,7 @@ mod bench { fn rand_isaac64(b: &mut Bencher) { let mut rng: Isaac64Rng = OsRng::new().unwrap().gen(); b.iter(|| { - for _ in range(0, RAND_BENCH_N) { + for _ in 0..RAND_BENCH_N { rng.gen::<uint>(); } }); @@ -685,7 +685,7 @@ mod bench { fn rand_std(b: &mut Bencher) { let mut rng = StdRng::new().unwrap(); b.iter(|| { - for _ in range(0, RAND_BENCH_N) { + for _ in 0..RAND_BENCH_N { rng.gen::<uint>(); } }); diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index fb8fd0b5078..992afb2d10f 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -378,7 +378,7 @@ mod test { fn test_os_rng_tasks() { let mut txs = vec!(); - for _ in range(0, 20) { + for _ in 0u..20 { let (tx, rx) = channel(); txs.push(tx); @@ -392,7 +392,7 @@ mod test { Thread::yield_now(); let mut v = [0u8; 1000]; - for _ in range(0, 100) { + for _ in 0u..100 { r.next_u32(); Thread::yield_now(); r.next_u64(); diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs index 40710d627c0..581e540d3b6 100644 --- a/src/libstd/sync/barrier.rs +++ b/src/libstd/sync/barrier.rs @@ -18,7 +18,7 @@ use sync::{Mutex, Condvar}; /// use std::thread::Thread; /// /// let barrier = Arc::new(Barrier::new(10)); -/// for _ in range(0u, 10) { +/// for _ in 0u..10 { /// let c = barrier.clone(); /// // The same messages will be printed together. /// // You will NOT see any interleaving. @@ -121,7 +121,7 @@ mod tests { let barrier = Arc::new(Barrier::new(N)); let (tx, rx) = channel(); - for _ in range(0u, N - 1) { + for _ in 0u..N - 1 { let c = barrier.clone(); let tx = tx.clone(); Thread::spawn(move|| { @@ -139,7 +139,7 @@ mod tests { let mut leader_found = barrier.wait().is_leader(); // Now, the barrier is cleared and we should get data. - for _ in range(0u, N - 1) { + for _ in 0u..N - 1 { if rx.recv().unwrap() { assert!(!leader_found); leader_found = true; diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index a7a5b084582..2ae81ad7dff 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -392,7 +392,7 @@ mod tests { let data = Arc::new((Mutex::new(0), Condvar::new())); let (tx, rx) = channel(); - for _ in range(0, N) { + for _ in 0..N { let data = data.clone(); let tx = tx.clone(); Thread::spawn(move|| { @@ -417,7 +417,7 @@ mod tests { cond.notify_all(); drop(cnt); - for _ in range(0, N) { + for _ in 0..N { rx.recv().unwrap(); } } 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(); diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index f7fdd60eb8c..c31010c170d 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -60,7 +60,7 @@ use sys_common::mutex as sys; /// let data = Arc::new(Mutex::new(0)); /// /// let (tx, rx) = channel(); -/// for _ in range(0u, 10) { +/// for _ in 0u..10 { /// let (data, tx) = (data.clone(), tx.clone()); /// Thread::spawn(move || { /// // The shared static can only be accessed once the lock is held. @@ -371,7 +371,7 @@ mod test { static K: uint = 3; fn inc() { - for _ in range(0, J) { + for _ in 0..J { unsafe { let _g = M.lock().unwrap(); CNT += 1; @@ -380,7 +380,7 @@ mod test { } let (tx, rx) = channel(); - for _ in range(0, K) { + for _ in 0..K { let tx2 = tx.clone(); Thread::spawn(move|| { inc(); tx2.send(()).unwrap(); }); let tx2 = tx.clone(); @@ -388,7 +388,7 @@ mod test { } drop(tx); - for _ in range(0, 2 * K) { + for _ in 0..2 * K { rx.recv().unwrap(); } assert_eq!(unsafe {CNT}, J * K * 2); diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index 1c489540581..0604003cecd 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -147,10 +147,10 @@ mod test { static mut run: bool = false; let (tx, rx) = channel(); - for _ in range(0u, 10) { + for _ in 0u..10 { let tx = tx.clone(); Thread::spawn(move|| { - for _ in range(0u, 4) { Thread::yield_now() } + for _ in 0u..4 { Thread::yield_now() } unsafe { O.call_once(|| { assert!(!run); @@ -170,7 +170,7 @@ mod test { assert!(run); } - for _ in range(0u, 10) { + for _ in 0u..10 { rx.recv().unwrap(); } } diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 12befbf72e3..b5817ad64f6 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -416,11 +416,11 @@ mod tests { static M: uint = 1000; let (tx, rx) = channel::<()>(); - for _ in range(0, N) { + for _ in 0..N { let tx = tx.clone(); Thread::spawn(move|| { let mut rng = rand::thread_rng(); - for _ in range(0, M) { + for _ in 0..M { if rng.gen_weighted_bool(N) { drop(R.write().unwrap()); } else { @@ -488,7 +488,7 @@ mod tests { Thread::spawn(move|| { let mut lock = arc2.write().unwrap(); - for _ in range(0u, 10) { + for _ in 0u..10 { let tmp = *lock; *lock = -1; Thread::yield_now(); @@ -499,7 +499,7 @@ mod tests { // Readers try to catch the writer in the act let mut children = Vec::new(); - for _ in range(0u, 5) { + for _ in 0u..5 { let arc3 = arc.clone(); children.push(Thread::scoped(move|| { let lock = arc3.read().unwrap(); diff --git a/src/libstd/sync/task_pool.rs b/src/libstd/sync/task_pool.rs index 3fac998d3e7..1bfcbcf96f1 100644 --- a/src/libstd/sync/task_pool.rs +++ b/src/libstd/sync/task_pool.rs @@ -66,7 +66,7 @@ impl<'a> Drop for Sentinel<'a> { /// let pool = TaskPool::new(4u); /// /// let (tx, rx) = channel(); -/// for _ in range(0, 8u) { +/// for _ in 0..8u { /// let tx = tx.clone(); /// pool.execute(move|| { /// tx.send(1u).unwrap(); @@ -96,7 +96,7 @@ impl TaskPool { let rx = Arc::new(Mutex::new(rx)); // Threadpool threads - for _ in range(0, threads) { + for _ in 0..threads { spawn_in_pool(rx.clone()); } @@ -151,7 +151,7 @@ mod test { let pool = TaskPool::new(TEST_TASKS); let (tx, rx) = channel(); - for _ in range(0, TEST_TASKS) { + for _ in 0..TEST_TASKS { let tx = tx.clone(); pool.execute(move|| { tx.send(1u).unwrap(); @@ -174,13 +174,13 @@ mod test { let pool = TaskPool::new(TEST_TASKS); // Panic all the existing threads. - for _ in range(0, TEST_TASKS) { + for _ in 0..TEST_TASKS { pool.execute(move|| -> () { panic!() }); } // Ensure new threads were spawned to compensate. let (tx, rx) = channel(); - for _ in range(0, TEST_TASKS) { + for _ in 0..TEST_TASKS { let tx = tx.clone(); pool.execute(move|| { tx.send(1u).unwrap(); @@ -198,7 +198,7 @@ mod test { let waiter = Arc::new(Barrier::new(TEST_TASKS + 1)); // Panic all the existing threads in a bit. - for _ in range(0, TEST_TASKS) { + for _ in 0..TEST_TASKS { let waiter = waiter.clone(); pool.execute(move|| { waiter.wait(); diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index d148f82184b..655195a3c28 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -235,7 +235,7 @@ unsafe extern "system" fn on_tls_callback(h: LPVOID, unsafe fn run_dtors() { let mut any_run = true; - for _ in range(0, 5i) { + for _ in 0..5i { if !any_run { break } any_run = false; let dtors = { |
