diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-26 16:05:07 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:49:01 -0500 |
| commit | efc97a51ffc798247e36156cf8e2d175bf509018 (patch) | |
| tree | 2add0ca20cbe4fc9abec6e98d5d15e2065d12322 /src/libstd | |
| parent | 7d661af9c86566088f7dbaeee25143ecde673b75 (diff) | |
| download | rust-efc97a51ffc798247e36156cf8e2d175bf509018.tar.gz rust-efc97a51ffc798247e36156cf8e2d175bf509018.zip | |
convert remaining `range(a, b)` to `a..b`
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/util.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 20 | ||||
| -rw-r--r-- | src/libstd/sys/unix/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index ad0cb3c1a7a..269e4ce29fd 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -1217,7 +1217,7 @@ mod test_set { for _ in s.iter() { panic!("s should be empty!"); } // reset to try again. - s.extend(range(1, 100)); + s.extend(1..100); } } } diff --git a/src/libstd/old_io/util.rs b/src/libstd/old_io/util.rs index 4b6d9b08141..87b3b9fe415 100644 --- a/src/libstd/old_io/util.rs +++ b/src/libstd/old_io/util.rs @@ -418,7 +418,7 @@ mod test { #[test] fn test_iter_reader() { - let mut r = IterReader::new(range(0u8, 8)); + let mut r = IterReader::new(0u8..8); let mut buf = [0, 0, 0]; let len = r.read(&mut buf).unwrap(); assert_eq!(len, 3); @@ -437,7 +437,7 @@ mod test { #[test] fn iter_reader_zero_length() { - let mut r = IterReader::new(range(0u8, 8)); + let mut r = IterReader::new(0u8..8); let mut buf = []; assert_eq!(Ok(0), r.read(&mut buf)); } diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index a27c217f86d..2969eec4737 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -427,7 +427,7 @@ pub fn random<T: Rand>() -> T { /// use std::rand::{thread_rng, sample}; /// /// let mut rng = thread_rng(); -/// let sample = sample(&mut rng, range(1i, 100), 5); +/// let sample = sample(&mut rng, 1i..100, 5); /// println!("{:?}", sample); /// ``` pub fn sample<T, I: Iterator<Item=T>, R: Rng>(rng: &mut R, diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 29ab7979e04..43e1b1a2264 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -1346,7 +1346,7 @@ mod test { #[test] fn oneshot_multi_thread_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = channel::<int>(); let _t = Thread::spawn(move|| { drop(rx); @@ -1357,7 +1357,7 @@ mod test { #[test] fn oneshot_multi_thread_send_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = channel::<int>(); let _t = Thread::spawn(move|| { drop(rx); @@ -1370,7 +1370,7 @@ mod test { #[test] fn oneshot_multi_thread_recv_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = channel::<int>(); Thread::spawn(move|| { let res = Thread::scoped(move|| { @@ -1388,7 +1388,7 @@ mod test { #[test] fn oneshot_multi_thread_send_recv_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = channel(); let _t = Thread::spawn(move|| { tx.send(box 10i).unwrap(); @@ -1399,7 +1399,7 @@ mod test { #[test] fn stream_send_recv_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = channel(); send(tx, 0); @@ -1810,7 +1810,7 @@ mod sync_tests { #[test] fn oneshot_multi_thread_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = sync_channel::<int>(0); let _t = Thread::spawn(move|| { drop(rx); @@ -1821,7 +1821,7 @@ mod sync_tests { #[test] fn oneshot_multi_thread_send_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = sync_channel::<int>(0); let _t = Thread::spawn(move|| { drop(rx); @@ -1834,7 +1834,7 @@ mod sync_tests { #[test] fn oneshot_multi_thread_recv_close_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = sync_channel::<int>(0); let _t = Thread::spawn(move|| { let res = Thread::scoped(move|| { @@ -1852,7 +1852,7 @@ mod sync_tests { #[test] fn oneshot_multi_thread_send_recv_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = sync_channel::<Box<int>>(0); let _t = Thread::spawn(move|| { tx.send(box 10i).unwrap(); @@ -1863,7 +1863,7 @@ mod sync_tests { #[test] fn stream_send_recv_stress() { - for _ in range(0, stress_factor()) { + for _ in 0..stress_factor() { let (tx, rx) = sync_channel::<Box<int>>(0); send(tx, 0); diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 6e12432649f..3fcca2f35e1 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -224,7 +224,7 @@ impl Process { if !setup(err_fd, libc::STDERR_FILENO) { fail(&mut output) } // close all other fds - for fd in range(3, getdtablesize()).rev() { + for fd in (3..getdtablesize()).rev() { if fd != output.fd() { let _ = close(fd as c_int); } diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 43f9e805db1..3d66718d00b 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -388,7 +388,7 @@ fn make_command_line(prog: &CString, args: &[CString]) -> String { cmd.push('"'); } let argvec: Vec<char> = arg.chars().collect(); - for i in range(0u, argvec.len()) { + for i in 0u..argvec.len() { append_char_at(cmd, argvec.as_slice(), i); } if quote { |
