diff options
| author | bors <bors@rust-lang.org> | 2014-01-29 20:06:36 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-29 20:06:36 -0800 |
| commit | 3cb72a3655cdbe1db7a3555ade0c909d541bf336 (patch) | |
| tree | 3026841f646fff3ba7ce4d8bc319f0ced7db5efa /src/libstd/io | |
| parent | 704f93ff5e8a8079af4a16fe984fb9f84b347d11 (diff) | |
| parent | 729060dbb95afd1d8562a6b3129555a173b81b0c (diff) | |
| download | rust-3cb72a3655cdbe1db7a3555ade0c909d541bf336.tar.gz rust-3cb72a3655cdbe1db7a3555ade0c909d541bf336.zip | |
auto merge of #11672 : bjz/rust/remove-times, r=brson
`Times::times` was always a second-class loop because it did not support the `break` and `continue` operations. Its playful appeal (which I liked) was then lost after `do` was disabled for closures. It's time to let this one go.
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 12 | ||||
| -rw-r--r-- | src/libstd/io/net/unix.rs | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 2d074df4919..fc608ce25a6 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -355,15 +355,15 @@ mod test { iotest!(fn multiple_connect_serial_ip4() { let addr = next_test_ip4(); - let max = 10; + let max = 10u; let (port, chan) = Chan::new(); spawn(proc() { port.recv(); - max.times(|| { + for _ in range(0, max) { let mut stream = TcpStream::connect(addr); stream.write([99]); - }); + } }); let mut acceptor = TcpListener::bind(addr).listen(); @@ -377,15 +377,15 @@ mod test { iotest!(fn multiple_connect_serial_ip6() { let addr = next_test_ip6(); - let max = 10; + let max = 10u; let (port, chan) = Chan::new(); spawn(proc() { port.recv(); - max.times(|| { + for _ in range(0, max) { let mut stream = TcpStream::connect(addr); stream.write([99]); - }); + } }); let mut acceptor = TcpListener::bind(addr).listen(); diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index dcf6d2ad203..d470e9bfda1 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -234,20 +234,20 @@ mod tests { spawn(proc() { port.recv(); - times.times(|| { + for _ in range(0, times) { let mut stream = UnixStream::connect(&path2); stream.write([100]); - }) + } }); let mut acceptor = UnixListener::bind(&path1).listen(); chan.send(()); - times.times(|| { + for _ in range(0, times) { let mut client = acceptor.accept(); let mut buf = [0]; client.read(buf); assert_eq!(buf[0], 100); - }) + } } #[test] |
