diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-04-21 17:58:52 -0400 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-24 17:18:48 -0700 |
| commit | 9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9 (patch) | |
| tree | 1e9a15e8a55cc3947025ab3ac044c2f7977159d9 /src/libstd/io | |
| parent | f7f95c8f5a6294f161800dbb65a0423bb5248f34 (diff) | |
| download | rust-9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9.tar.gz rust-9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9.zip | |
librustc: Remove the fallback to `int` from typechecking.
This breaks a fair amount of code. The typical patterns are:
* `for _ in range(0, 10)`: change to `for _ in range(0u, 10)`;
* `println!("{}", 3)`: change to `println!("{}", 3i)`;
* `[1, 2, 3].len()`: change to `[1i, 2, 3].len()`.
RFC #30. Closes #6023.
[breaking-change]
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/extensions.rs | 4 | ||||
| -rw-r--r-- | src/libstd/io/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/mem.rs | 8 | ||||
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 8 | ||||
| -rw-r--r-- | src/libstd/io/net/udp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/unix.rs | 10 | ||||
| -rw-r--r-- | src/libstd/io/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/timer.rs | 6 |
8 files changed, 21 insertions, 21 deletions
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs index 84a1253e5b4..5d9865fded3 100644 --- a/src/libstd/io/extensions.rs +++ b/src/libstd/io/extensions.rs @@ -93,7 +93,7 @@ pub fn u64_to_le_bytes<T>(n: u64, size: uint, f: |v: &[u8]| -> T) -> T { let mut n = n; while i > 0u { bytes.push((n & 255_u64) as u8); - n >>= 8_u64; + n >>= 8; i -= 1u; } f(bytes.as_slice()) @@ -130,7 +130,7 @@ pub fn u64_to_be_bytes<T>(n: u64, size: uint, f: |v: &[u8]| -> T) -> T { let mut bytes = vec!(); let mut i = size; while i > 0u { - let shift = ((i - 1u) * 8u) as u64; + let shift = (i - 1u) * 8u; bytes.push((n >> shift) as u8); i -= 1u; } diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index a801dd0e7cb..d8e04f18239 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -1164,7 +1164,7 @@ mod test { let dir = &tmpdir.join("di_readdir"); check!(mkdir(dir, io::UserRWX)); let prefix = "foo"; - for n in range(0,3) { + for n in range(0i,3) { let f = dir.join(format!("{}.txt", n)); let mut w = check!(File::create(&f)); let msg_str = format!("{}{}", prefix, n.to_str()); diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index ec3d9370833..3443a85b468 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -611,7 +611,7 @@ mod test { fn bench_mem_writer(b: &mut Bencher) { b.iter(|| { let mut wr = MemWriter::new(); - for _i in range(0, 10) { + for _i in range(0u, 10) { wr.write([5, .. 10]).unwrap(); } assert_eq!(wr.unwrap().as_slice(), [5, .. 100].as_slice()); @@ -624,7 +624,7 @@ mod test { let buf = Vec::from_slice([5 as u8, ..100]); { let mut rdr = MemReader::new(buf); - for _i in range(0, 10) { + for _i in range(0u, 10) { let mut buf = [0 as u8, .. 10]; rdr.read(buf).unwrap(); assert_eq!(buf.as_slice(), [5, .. 10].as_slice()); @@ -639,7 +639,7 @@ mod test { let mut buf = [0 as u8, ..100]; { let mut wr = BufWriter::new(buf); - for _i in range(0, 10) { + for _i in range(0u, 10) { wr.write([5, .. 10]).unwrap(); } } @@ -653,7 +653,7 @@ mod test { let buf = [5 as u8, ..100]; { let mut rdr = BufReader::new(buf); - for _i in range(0, 10) { + for _i in range(0u, 10) { let mut buf = [0 as u8, .. 10]; rdr.read(buf).unwrap(); assert_eq!(buf.as_slice(), [5, .. 10].as_slice()); diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 8ffb057c934..7d6ab9d7419 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -1154,7 +1154,7 @@ mod test { port).unwrap()); }); let _l = rx.recv(); - for i in range(0, 1001) { + for i in range(0i, 1001) { match a.accept() { Ok(..) => break, Err(ref e) if e.kind == TimedOut => {} @@ -1258,7 +1258,7 @@ mod test { assert_eq!(s.read([0]).err().unwrap().kind, TimedOut); s.set_timeout(Some(20)); - for i in range(0, 1001) { + for i in range(0i, 1001) { match s.write([0, .. 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -1298,7 +1298,7 @@ mod test { assert_eq!(s.read([0]).err().unwrap().kind, TimedOut); tx.send(()); - for _ in range(0, 100) { + for _ in range(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(0, 1001) { + for i in range(0i, 1001) { match s.write([0, .. 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index e1f9cb3889f..5f6de52f866 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -569,7 +569,7 @@ mod test { let _b = UdpSocket::bind(addr2).unwrap(); a.set_write_timeout(Some(1000)); - for _ in range(0, 100) { + for _ in range(0u, 100) { match a.sendto([0, ..4*1024], addr2) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index 8f4f66836ad..c5ddda9945d 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -321,7 +321,7 @@ mod tests { }; spawn(proc() { - for _ in range(0, times) { + for _ in range(0u, times) { let mut stream = UnixStream::connect(&path2); match stream.write([100]) { Ok(..) => {} @@ -477,7 +477,7 @@ mod tests { tx.send(UnixStream::connect(&addr2).unwrap()); }); let l = rx.recv(); - for i in range(0, 1001) { + for i in range(0u, 1001) { match a.accept() { Ok(..) => break, Err(ref e) if e.kind == TimedOut => {} @@ -586,7 +586,7 @@ mod tests { assert_eq!(s.read([0]).err().unwrap().kind, TimedOut); s.set_timeout(Some(20)); - for i in range(0, 1001) { + for i in range(0u, 1001) { match s.write([0, .. 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -629,7 +629,7 @@ mod tests { assert_eq!(s.read([0]).err().unwrap().kind, TimedOut); tx.send(()); - for _ in range(0, 100) { + for _ in range(0u, 100) { assert!(s.write([0, ..128 * 1024]).is_ok()); } }) @@ -647,7 +647,7 @@ mod tests { let mut s = a.accept().unwrap(); s.set_write_timeout(Some(20)); - for i in range(0, 1001) { + for i in range(0u, 1001) { match s.write([0, .. 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 1dcf08b2322..ecd6693990c 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -908,7 +908,7 @@ mod tests { iotest!(fn test_zero() { let mut p = sleeper(); p.signal_kill().unwrap(); - for _ in range(0, 20) { + for _ in range(0i, 20) { if p.signal(0).is_err() { assert!(!p.wait().unwrap().success()); return diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index da099953a49..9ae855536ac 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -115,7 +115,7 @@ impl Timer { /// let mut timer = Timer::new().unwrap(); /// let ten_milliseconds = timer.oneshot(10); /// - /// for _ in range(0, 100) { /* do work */ } + /// for _ in range(0u, 100) { /* do work */ } /// /// // blocks until 10 ms after the `oneshot` call /// ten_milliseconds.recv(); @@ -157,12 +157,12 @@ impl Timer { /// let mut timer = Timer::new().unwrap(); /// let ten_milliseconds = timer.periodic(10); /// - /// for _ in range(0, 100) { /* do work */ } + /// for _ in range(0u, 100) { /* do work */ } /// /// // blocks until 10 ms after the `periodic` call /// ten_milliseconds.recv(); /// - /// for _ in range(0, 100) { /* do work */ } + /// for _ in range(0u, 100) { /* do work */ } /// /// // blocks until 20 ms after the `periodic` call (*not* 10ms after the /// // previous `recv`) |
