diff options
| author | Tobias Bucher <tobiasbucher5991@gmail.com> | 2015-01-31 17:23:42 +0100 |
|---|---|---|
| committer | Tobias Bucher <tobiasbucher5991@gmail.com> | 2015-01-31 17:40:40 +0100 |
| commit | b4a43f3864e394959a7d3c3efae6da85bdc59c71 (patch) | |
| tree | 90ce64d37d1e616c4916281f5e1eb338d54ff7a0 /src/libstd | |
| parent | 105bfd30012a7d4278117e973b56c170a59fc20d (diff) | |
| download | rust-b4a43f3864e394959a7d3c3efae6da85bdc59c71.tar.gz rust-b4a43f3864e394959a7d3c3efae6da85bdc59c71.zip | |
Kill more `isize`s
Diffstat (limited to 'src/libstd')
| -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/net/tcp.rs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 3095c2c0e41..c6dcb0d230f 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -1198,7 +1198,7 @@ mod test_set { #[test] fn test_drain() { - let mut s: HashSet<int> = (1is..100).collect(); + let mut s: HashSet<i32> = (1..100).collect(); // try this a bunch of times to make sure we don't screw up internal state. for _ in 0..20 { @@ -1217,7 +1217,7 @@ mod test_set { for _ in s.iter() { panic!("s should be empty!"); } // reset to try again. - s.extend(1is..100); + s.extend(1..100); } } } diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index 1337675544d..0a9aeb849be 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 0is..3 { + for n in 0..3 { let f = dir.join(format!("{}.txt", n)); let mut w = check!(File::create(&f)); let msg_str = format!("{}{}", prefix, n); diff --git a/src/libstd/old_io/net/tcp.rs b/src/libstd/old_io/net/tcp.rs index 122ac4c3445..ebf7f6cc0f2 100644 --- a/src/libstd/old_io/net/tcp.rs +++ b/src/libstd/old_io/net/tcp.rs @@ -1160,7 +1160,7 @@ mod test { tx.send(TcpStream::connect(addr).unwrap()).unwrap(); }); let _l = rx.recv().unwrap(); - for i in 0is..1001 { + for i in 0i32..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 0is..1001 { + for i in 0i32..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -1318,7 +1318,7 @@ mod test { let mut s = a.accept().unwrap(); s.set_write_timeout(Some(20)); - for i in 0is..1001 { + for i in 0i32..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, |
