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/old_io | |
| parent | c300d681bd2e901ef39591bbfb1ea4568ac6be70 (diff) | |
`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/old_io')
| -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 |
8 files changed, 24 insertions, 24 deletions
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`) |
