diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-26 15:44:22 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:46:44 -0500 |
| commit | c300d681bd2e901ef39591bbfb1ea4568ac6be70 (patch) | |
| tree | ee0b4b0a74846595b700d1b2375fd10309b63a22 /src/libstd | |
| parent | bedd8108dc9b79402d1ea5349d766275f73398ff (diff) | |
| download | rust-c300d681bd2e901ef39591bbfb1ea4568ac6be70.tar.gz rust-c300d681bd2e901ef39591bbfb1ea4568ac6be70.zip | |
`range(a, b).foo()` -> `(a..b).foo()`
sed -i 's/ range(\([^,]*\), *\([^()]*\))\./ (\1\.\.\2)\./g' **/*.rs
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 4 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/old_io/extensions.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/args.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/sync.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/backtrace.rs | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index ae295c3e8e4..27e5295d2c8 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1775,11 +1775,11 @@ mod test_map { for _ in half {} DROP_VECTOR.with(|v| { - let nk = range(0u, 100).filter(|&i| { + let nk = (0u..100).filter(|&i| { v.borrow()[i] == 1 }).count(); - let nv = range(0u, 100).filter(|&i| { + let nv = (0u..100).filter(|&i| { v.borrow()[i+100] == 1 }).count(); diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 84f01f70c3e..dc16fd88201 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> = range(1, 100).collect(); + let mut s: HashSet<int> = (1..100).collect(); // try this a bunch of times to make sure we don't screw up internal state. for _ in range(0i, 20) { diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index dad8b70ceac..cb74c741b2f 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -1001,7 +1001,7 @@ mod tests { fn test_pow() { fn naive_pow<T: Int>(base: T, exp: uint) -> T { let one: T = Int::one(); - range(0, exp).fold(one, |acc, _| acc * base) + (0..exp).fold(one, |acc, _| acc * base) } macro_rules! assert_pow { (($num:expr, $exp:expr) => $expected:expr) => {{ @@ -1028,7 +1028,7 @@ mod bench { #[bench] fn bench_pow_function(b: &mut Bencher) { - let v = range(0, 1024u).collect::<Vec<_>>(); + let v = (0..1024u).collect::<Vec<_>>(); b.iter(|| {v.iter().fold(0u, |old, new| old.pow(*new));}); } } diff --git a/src/libstd/old_io/extensions.rs b/src/libstd/old_io/extensions.rs index 826271a9f83..f429f731b7d 100644 --- a/src/libstd/old_io/extensions.rs +++ b/src/libstd/old_io/extensions.rs @@ -518,7 +518,7 @@ mod bench { ({ use super::u64_from_be_bytes; - let data = range(0u8, $stride*100+$start_index).collect::<Vec<_>>(); + let data = (0u8..$stride*100+$start_index).collect::<Vec<_>>(); let mut sum = 0u64; $b.iter(|| { let mut i = $start_index; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 979a61d20d5..a347b4c0665 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -617,7 +617,7 @@ unsafe fn load_argc_and_argv(argc: int, argv: *const *const c_char) -> Vec<Vec<u8>> { use iter::range; - range(0, argc as uint).map(|i| { + (0..argc as uint).map(|i| { ffi::c_str_to_bytes(&*argv.offset(i as int)).to_vec() }).collect() } @@ -717,7 +717,7 @@ fn real_args() -> Vec<String> { let lpCmdLine = unsafe { GetCommandLineW() }; let szArgList = unsafe { CommandLineToArgvW(lpCmdLine, lpArgCount) }; - let args: Vec<_> = range(0, nArgs as uint).map(|i| unsafe { + let args: Vec<_> = (0..nArgs as uint).map(|i| unsafe { // Determine the length of this argument. let ptr = *szArgList.offset(i as int); let mut len = 0; diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 0a6dc386edf..7193d4438e5 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -176,7 +176,7 @@ //! } //! //! fn free_doors(blocked: &[uint]) -> Vec<uint> { -//! range(0, 3).filter(|x| !blocked.contains(x)).collect() +//! (0u..3).filter(|x| !blocked.contains(x)).collect() //! } //! //! fn main() { @@ -601,7 +601,7 @@ mod test { let max_val = 100i; let mut r = thread_rng(); - let vals = range(min_val, max_val).collect::<Vec<int>>(); + let vals = (min_val..max_val).collect::<Vec<int>>(); let small_sample = sample(&mut r, vals.iter(), 5); let large_sample = sample(&mut r, vals.iter(), vals.len() + 5); diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs index 86abacb9365..b63f2e2d73a 100644 --- a/src/libstd/rt/args.rs +++ b/src/libstd/rt/args.rs @@ -97,7 +97,7 @@ mod imp { unsafe fn load_argc_and_argv(argc: int, argv: *const *const u8) -> Vec<Vec<u8>> { let argv = argv as *const *const libc::c_char; - range(0, argc as uint).map(|i| { + (0..argc as uint).map(|i| { ffi::c_str_to_bytes(&*argv.offset(i as int)).to_vec() }).collect() } diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index d38f14a9130..574892d419a 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -150,7 +150,7 @@ impl<T: Send> Packet<T> { tail: ptr::null_mut(), }, buf: Buffer { - buf: range(0, cap + if cap == 0 {1} else {0}).map(|_| None).collect(), + buf: (0..cap + if cap == 0 {1} else {0}).map(|_| None).collect(), start: 0, size: 0, }, diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs index ca1a16d8e17..e310b8f6d90 100644 --- a/src/libstd/sys/unix/backtrace.rs +++ b/src/libstd/sys/unix/backtrace.rs @@ -126,7 +126,7 @@ pub fn write(w: &mut Writer) -> IoResult<()> { let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint}; // skipping the first one as it is write itself - let iter = range(1, cnt).map(|i| { + let iter = (1..cnt).map(|i| { print(w, i as int, buf[i]) }); result::fold(iter, (), |_, _| ()) |
