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/test/bench | |
| parent | bedd8108dc9b79402d1ea5349d766275f73398ff (diff) | |
`range(a, b).foo()` -> `(a..b).foo()`
sed -i 's/ range(\([^,]*\), *\([^()]*\))\./ (\1\.\.\2)\./g' **/*.rs
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/core-map.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-fannkuch-redux.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-k-nucleotide.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-mandelbrot.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/shootout-meteor.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/sudoku.rs | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs index cc7a0f2c768..663ee9b719f 100644 --- a/src/test/bench/core-map.rs +++ b/src/test/bench/core-map.rs @@ -62,13 +62,13 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) { println!(" Descending integers:"); timed("insert", || { - for i in range(0, n_keys).rev() { + for i in (0..n_keys).rev() { map.insert(i, i + 1); } }); timed("search", || { - for i in range(0, n_keys).rev() { + for i in (0..n_keys).rev() { assert_eq!(map.find(&i).unwrap(), &(i + 1)); } }); diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout-fannkuch-redux.rs index 5a0a4099389..ebdecbc8d02 100644 --- a/src/test/bench/shootout-fannkuch-redux.rs +++ b/src/test/bench/shootout-fannkuch-redux.rs @@ -97,7 +97,7 @@ impl Perm { *place = i as i32 + 1; } - for i in range(1, self.n as uint).rev() { + for i in (1..self.n as uint).rev() { let d = idx / self.fact[i] as i32; self.cnt[i] = d; idx %= self.fact[i] as i32; @@ -161,7 +161,7 @@ fn fannkuch(n: i32) -> (i32, i32) { let mut futures = vec![]; let k = perm.max() / N; - for (_, j) in range(0, N).zip(iter::count(0, k)) { + for (_, j) in (0..N).zip(iter::count(0, k)) { let max = cmp::min(j+k, perm.max()); futures.push(Thread::scoped(move|| { diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 0d51eca8e8b..67654f979c2 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -135,7 +135,7 @@ struct Items<'a> { impl Table { fn new() -> Table { Table { - items: range(0, TABLE_SIZE).map(|_| None).collect() + items: (0..TABLE_SIZE).map(|_| None).collect() } } @@ -299,7 +299,7 @@ fn main() { }; let input = Arc::new(input); - let nb_freqs: Vec<_> = range(1u, 3).map(|i| { + let nb_freqs: Vec<_> = (1u..3).map(|i| { let input = input.clone(); (i, Thread::scoped(move|| generate_frequencies(input.as_slice(), i))) }).collect(); diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 192f363599c..d0959068ce8 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -80,7 +80,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> { let mut precalc_r = Vec::with_capacity(w); let mut precalc_i = Vec::with_capacity(h); - let precalc_futures = range(0, WORKERS).map(|i| { + let precalc_futures = (0..WORKERS).map(|i| { Thread::scoped(move|| { let mut rs = Vec::with_capacity(w / WORKERS); let mut is = Vec::with_capacity(w / WORKERS); @@ -118,7 +118,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> { let arc_init_r = Arc::new(precalc_r); let arc_init_i = Arc::new(precalc_i); - let data = range(0, WORKERS).map(|i| { + let data = (0..WORKERS).map(|i| { let vec_init_r = arc_init_r.clone(); let vec_init_i = arc_init_i.clone(); diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 0480c9d884a..b31241f1215 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -169,7 +169,7 @@ fn make_masks() -> Vec<Vec<Vec<u64> > > { .map(|(id, p)| transform(p, id != 3)) .collect(); - range(0i, 50).map(|yx| { + (0i..50).map(|yx| { transforms.iter().enumerate().map(|(id, t)| { t.iter().filter_map(|p| mask(yx / 5, yx % 5, id, p)).collect() }).collect() @@ -297,7 +297,7 @@ fn search( let masks_at = &masks[i]; // for every unused piece - for id in range(0u, 10).filter(|&id| board & (1 << (id + 50)) == 0) { + for id in (0u..10).filter(|&id| board & (1 << (id + 50)) == 0) { // for each mask that fits on the board for m in masks_at[id].iter().filter(|&m| board & *m == 0) { // This check is too costly. diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 30a0bd7bd91..8c6925a0f1f 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -49,8 +49,8 @@ impl Sudoku { } pub fn from_vec(vec: &[[u8;9];9]) -> Sudoku { - let g = range(0, 9u).map(|i| { - range(0, 9u).map(|j| { vec[i][j] }).collect() + let g = (0..9u).map(|i| { + (0..9u).map(|j| { vec[i][j] }).collect() }).collect(); return Sudoku::new(g) } |
