From efc97a51ffc798247e36156cf8e2d175bf509018 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 26 Jan 2015 16:05:07 -0500 Subject: [PATCH] convert remaining `range(a, b)` to `a..b` --- src/libcollections/binary_heap.rs | 2 +- src/libcollections/btree/map.rs | 2 +- src/libcollections/dlist.rs | 2 +- src/libcollections/ring_buf.rs | 4 +-- src/libcollections/slice.rs | 4 +-- src/libcollections/vec.rs | 28 ++++++++--------- src/libcollections/vec_map.rs | 2 +- src/libcore/borrow.rs | 2 +- src/libcore/str/mod.rs | 2 +- src/libcoretest/iter.rs | 30 +++++++++---------- src/libcoretest/str.rs | 2 +- src/libgraphviz/lib.rs | 4 +-- src/librustc/metadata/tydecode.rs | 2 +- src/librustc/middle/dependency_format.rs | 2 +- src/librustc/middle/infer/error_reporting.rs | 3 +- .../middle/infer/region_inference/mod.rs | 6 ++-- src/librustc/middle/resolve_lifetime.rs | 4 +-- src/librustc/middle/traits/select.rs | 2 +- src/librustc/util/lev_distance.rs | 2 +- src/librustc_trans/back/write.rs | 4 +-- src/librustc_trans/trans/_match.rs | 10 +++---- src/librustc_trans/trans/base.rs | 2 +- src/librustc_trans/trans/callee.rs | 2 +- src/librustc_trans/trans/context.rs | 2 +- src/librustc_trans/trans/foreign.rs | 2 +- src/librustc_typeck/astconv.rs | 2 +- src/librustc_typeck/check/_match.rs | 2 +- src/librustc_typeck/check/mod.rs | 6 ++-- src/librustc_typeck/rscope.rs | 2 +- src/librustdoc/html/render.rs | 2 +- src/libserialize/json.rs | 6 ++-- src/libstd/collections/hash/set.rs | 2 +- src/libstd/old_io/util.rs | 4 +-- src/libstd/rand/mod.rs | 2 +- src/libstd/sync/mpsc/mod.rs | 20 ++++++------- src/libstd/sys/unix/process.rs | 2 +- src/libstd/sys/windows/process.rs | 2 +- src/libsyntax/ext/deriving/generic/mod.rs | 2 +- src/libsyntax/ext/format.rs | 2 +- src/libsyntax/ext/quote.rs | 2 +- src/libsyntax/ext/tt/macro_parser.rs | 2 +- src/libtest/stats.rs | 2 +- src/test/bench/shootout-fannkuch-redux.rs | 2 +- src/test/bench/shootout-k-nucleotide-pipes.rs | 2 +- src/test/bench/shootout-meteor.rs | 4 +-- src/test/compile-fail/issue-14303-fncall.rs | 2 +- src/test/run-pass/issue-3609.rs | 2 +- ...owned-object-borrowed-method-headerless.rs | 2 +- 48 files changed, 101 insertions(+), 102 deletions(-) diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index 13a37882ed9..f717fc6075d 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -67,7 +67,7 @@ //! // for a simpler implementation. //! fn shortest_path(adj_list: &Vec>, start: uint, goal: uint) -> uint { //! // dist[node] = current shortest distance from `start` to `node` -//! let mut dist: Vec<_> = range(0, adj_list.len()).map(|_| uint::MAX).collect(); +//! let mut dist: Vec<_> = (0..adj_list.len()).map(|_| uint::MAX).collect(); //! //! let mut heap = BinaryHeap::new(); //! diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index b916ba8cbf6..4f2c2cb6028 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -1730,7 +1730,7 @@ mod test { let map: BTreeMap = (0..size).map(|i| (i, i)).collect(); let mut j = 0u; - for ((&k, &v), i) in map.range(Included(&2), Unbounded).zip(range(2u, size)) { + for ((&k, &v), i) in map.range(Included(&2), Unbounded).zip(2u..size) { assert_eq!(k, i); assert_eq!(v, i); j += 1; diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index 60f3413ebdc..aded4b8a7ac 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -599,7 +599,7 @@ impl DList { } else { // better off starting from the end let mut iter = self.iter_mut(); - for _ in range(0, len - 1 - (at - 1)) { + for _ in 0..len - 1 - (at - 1) { iter.next_back(); } iter.tail diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index 6d0911ad9ab..14f1f88613a 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -388,7 +388,7 @@ impl RingBuf { /// use std::collections::RingBuf; /// /// let mut buf = RingBuf::with_capacity(15); - /// buf.extend(range(0u, 4)); + /// buf.extend(0u..4); /// assert_eq!(buf.capacity(), 15); /// buf.shrink_to_fit(); /// assert!(buf.capacity() >= 4); @@ -483,7 +483,7 @@ impl RingBuf { #[unstable(feature = "collections", reason = "matches collection reform specification; waiting on panic semantics")] pub fn truncate(&mut self, len: uint) { - for _ in range(len, self.len()) { + for _ in len..self.len() { self.pop_back(); } } diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 8f8f9588924..1046e3077ea 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -1254,7 +1254,7 @@ impl Iterator for ElementSwaps { #[inline] fn size_hint(&self) -> (uint, Option) { // For a vector of size n, there are exactly n! permutations. - let n = range(2, self.sdir.len() + 1).product(); + let n = (2..self.sdir.len() + 1).product(); (n - self.swaps_made, Some(n - self.swaps_made)) } } @@ -1385,7 +1385,7 @@ fn merge_sort(v: &mut [T], mut compare: F) where F: FnMut(&T, &T) -> Order // .offset-ing. for start in range_step(0, len, insertion) { // start <= i < len; - for i in range(start, cmp::min(start + insertion, len)) { + for i in start..cmp::min(start + insertion, len) { // j satisfies: start <= j <= i; let mut j = i as int; unsafe { diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 8775a6d1120..74f6d4bad09 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1079,7 +1079,7 @@ impl Vec { pub fn push_all(&mut self, other: &[T]) { self.reserve(other.len()); - for i in range(0, other.len()) { + for i in 0..other.len() { let len = self.len(); // Unsafe code so this can be optimised to a memcpy (or something similarly @@ -1988,12 +1988,12 @@ mod tests { let mut v = Vec::new(); let mut w = Vec::new(); - v.extend(range(0i, 3)); + v.extend(0i..3); for i in 0i..3 { w.push(i) } assert_eq!(v, w); - v.extend(range(3i, 10)); + v.extend(3i..10); for i in 3i..10 { w.push(i) } assert_eq!(v, w); @@ -2499,7 +2499,7 @@ mod tests { } fn do_bench_from_slice(b: &mut Bencher, src_len: uint) { - let src: Vec = FromIterator::from_iter(range(0, src_len)); + let src: Vec = FromIterator::from_iter(0..src_len); b.bytes = src_len as u64; @@ -2531,7 +2531,7 @@ mod tests { } fn do_bench_from_iter(b: &mut Bencher, src_len: uint) { - let src: Vec = FromIterator::from_iter(range(0, src_len)); + let src: Vec = FromIterator::from_iter(0..src_len); b.bytes = src_len as u64; @@ -2563,8 +2563,8 @@ mod tests { } fn do_bench_extend(b: &mut Bencher, dst_len: uint, src_len: uint) { - let dst: Vec = FromIterator::from_iter(range(0, dst_len)); - let src: Vec = FromIterator::from_iter(range(dst_len, dst_len + src_len)); + let dst: Vec = FromIterator::from_iter(0..dst_len); + let src: Vec = FromIterator::from_iter(dst_len..dst_len + src_len); b.bytes = src_len as u64; @@ -2612,8 +2612,8 @@ mod tests { } fn do_bench_push_all(b: &mut Bencher, dst_len: uint, src_len: uint) { - let dst: Vec = FromIterator::from_iter(range(0, dst_len)); - let src: Vec = FromIterator::from_iter(range(dst_len, dst_len + src_len)); + let dst: Vec = FromIterator::from_iter(0..dst_len); + let src: Vec = FromIterator::from_iter(dst_len..dst_len + src_len); b.bytes = src_len as u64; @@ -2661,8 +2661,8 @@ mod tests { } fn do_bench_push_all_move(b: &mut Bencher, dst_len: uint, src_len: uint) { - let dst: Vec = FromIterator::from_iter(range(0u, dst_len)); - let src: Vec = FromIterator::from_iter(range(dst_len, dst_len + src_len)); + let dst: Vec = FromIterator::from_iter(0u..dst_len); + let src: Vec = FromIterator::from_iter(dst_len..dst_len + src_len); b.bytes = src_len as u64; @@ -2710,7 +2710,7 @@ mod tests { } fn do_bench_clone(b: &mut Bencher, src_len: uint) { - let src: Vec = FromIterator::from_iter(range(0, src_len)); + let src: Vec = FromIterator::from_iter(0..src_len); b.bytes = src_len as u64; @@ -2742,8 +2742,8 @@ mod tests { } fn do_bench_clone_from(b: &mut Bencher, times: uint, dst_len: uint, src_len: uint) { - let dst: Vec = FromIterator::from_iter(range(0, src_len)); - let src: Vec = FromIterator::from_iter(range(dst_len, dst_len + src_len)); + let dst: Vec = FromIterator::from_iter(0..src_len); + let src: Vec = FromIterator::from_iter(dst_len..dst_len + src_len); b.bytes = (times * src_len) as u64; diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 3d28284c9bf..9f83b91fc9b 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -459,7 +459,7 @@ impl VecMap { pub fn insert(&mut self, key: uint, value: V) -> Option { let len = self.v.len(); if len <= key { - self.v.extend(range(0, key - len + 1).map(|_| None)); + self.v.extend((0..key - len + 1).map(|_| None)); } replace(&mut self.v[key], Some(value)) } diff --git a/src/libcore/borrow.rs b/src/libcore/borrow.rs index be144b052c7..035443e9c3f 100644 --- a/src/libcore/borrow.rs +++ b/src/libcore/borrow.rs @@ -125,7 +125,7 @@ impl ToOwned for T where T: Clone { /// use std::borrow::Cow; /// /// fn abs_all(input: &mut Cow, [int]>) { -/// for i in range(0, input.len()) { +/// for i in 0..input.len() { /// let v = input[i]; /// if v < 0 { /// // clones into a vector the first time (if not already owned) diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index dc57d22bbca..9f1d781fcbf 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -800,7 +800,7 @@ impl TwoWaySearcher { // See if the right part of the needle matches let start = if long_period { self.crit_pos } else { cmp::max(self.crit_pos, self.memory) }; - for i in range(start, needle.len()) { + for i in start..needle.len() { if needle[i] != haystack[self.position + i] { self.position += i - self.crit_pos + 1; if !long_period { diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index fe8a12436ff..8bcd4982fba 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -305,7 +305,7 @@ fn test_cycle() { #[test] fn test_iterator_nth() { let v: &[_] = &[0i, 1, 2, 3, 4]; - for i in range(0u, v.len()) { + for i in 0u..v.len() { assert_eq!(v.iter().nth(i).unwrap(), &v[i]); } assert_eq!(v.iter().nth(v.len()), None); @@ -458,7 +458,7 @@ fn test_min_by() { #[test] fn test_by_ref() { - let mut xs = range(0i, 10); + let mut xs = 0i..10; // sum the first five values let partial_sum = xs.by_ref().take(5).fold(0, |a, b| a + b); assert_eq!(partial_sum, 10); @@ -730,12 +730,12 @@ fn test_random_access_cycle() { #[test] fn test_double_ended_range() { - assert!(range(11i, 14).rev().collect::>() == vec![13i, 12, 11]); + assert!((11i..14).rev().collect::>() == vec![13i, 12, 11]); for _ in (10i..0).rev() { panic!("unreachable"); } - assert!(range(11u, 14).rev().collect::>() == vec![13u, 12, 11]); + assert!((11u..14).rev().collect::>() == vec![13u, 12, 11]); for _ in (10u..0).rev() { panic!("unreachable"); } @@ -743,19 +743,19 @@ fn test_double_ended_range() { #[test] fn test_range() { - assert!(range(0i, 5).collect::>() == vec![0i, 1, 2, 3, 4]); - assert!(range(-10i, -1).collect::>() == + assert!((0i..5).collect::>() == vec![0i, 1, 2, 3, 4]); + assert!((-10i..-1).collect::>() == vec![-10, -9, -8, -7, -6, -5, -4, -3, -2]); - assert!(range(0i, 5).rev().collect::>() == vec![4, 3, 2, 1, 0]); - assert_eq!(range(200i, -5).count(), 0); - assert_eq!(range(200i, -5).rev().count(), 0); - assert_eq!(range(200i, 200).count(), 0); - assert_eq!(range(200i, 200).rev().count(), 0); + assert!((0i..5).rev().collect::>() == vec![4, 3, 2, 1, 0]); + assert_eq!((200i..-5).count(), 0); + assert_eq!((200i..-5).rev().count(), 0); + assert_eq!((200i..200).count(), 0); + assert_eq!((200i..200).rev().count(), 0); - assert_eq!(range(0i, 100).size_hint(), (100, Some(100))); + assert_eq!((0i..100).size_hint(), (100, Some(100))); // this test is only meaningful when sizeof uint < sizeof u64 - assert_eq!(range(uint::MAX - 1, uint::MAX).size_hint(), (1, Some(1))); - assert_eq!(range(-10i, -1).size_hint(), (9, Some(9))); + assert_eq!((uint::MAX - 1..uint::MAX).size_hint(), (1, Some(1))); + assert_eq!((-10i..-1).size_hint(), (9, Some(9))); } #[test] @@ -892,7 +892,7 @@ fn bench_rposition(b: &mut Bencher) { #[bench] fn bench_skip_while(b: &mut Bencher) { b.iter(|| { - let it = range(0u, 100); + let it = 0u..100; let mut sum = 0; it.skip_while(|&x| { sum += x; sum < 4000 }).all(|_| true); }); diff --git a/src/libcoretest/str.rs b/src/libcoretest/str.rs index 3d89b26be04..938755113b5 100644 --- a/src/libcoretest/str.rs +++ b/src/libcoretest/str.rs @@ -17,7 +17,7 @@ fn test_bool_from_str() { fn check_contains_all_substrings(s: &str) { assert!(s.contains("")); - for i in range(0, s.len()) { + for i in 0..s.len() { for j in range(i+1, s.len() + 1) { assert!(s.contains(&s[i..j])); } diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs index 171b4ec2097..deb00912646 100644 --- a/src/libgraphviz/lib.rs +++ b/src/libgraphviz/lib.rs @@ -176,7 +176,7 @@ //! } //! //! impl<'a> dot::GraphWalk<'a, Nd, Ed<'a>> for Graph { -//! fn nodes(&self) -> dot::Nodes<'a,Nd> { range(0,self.nodes.len()).collect() } +//! fn nodes(&self) -> dot::Nodes<'a,Nd> { (0..self.nodes.len()).collect() } //! fn edges(&'a self) -> dot::Edges<'a,Ed<'a>> { self.edges.iter().collect() } //! fn source(&self, e: &Ed) -> Nd { let & &(s,_) = e; s } //! fn target(&self, e: &Ed) -> Nd { let & &(_,t) = e; t } @@ -715,7 +715,7 @@ mod tests { impl<'a> GraphWalk<'a, Node, &'a Edge> for LabelledGraph { fn nodes(&'a self) -> Nodes<'a,Node> { - range(0u, self.node_labels.len()).collect() + (0u..self.node_labels.len()).collect() } fn edges(&'a self) -> Edges<'a,&'a Edge> { self.edges.iter().collect() diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 2ee4b6fbbd4..51252a342a5 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -132,7 +132,7 @@ pub fn parse_state_from_data<'a, 'tcx>(data: &'a [u8], crate_num: ast::CrateNum, fn data_log_string(data: &[u8], pos: uint) -> String { let mut buf = String::new(); buf.push_str("<<"); - for i in range(pos, data.len()) { + for i in pos..data.len() { let c = data[i]; if c > 0x20 && c <= 0x7F { buf.push(c as char); diff --git a/src/librustc/middle/dependency_format.rs b/src/librustc/middle/dependency_format.rs index 95e6edd6dfe..16b7d6134c3 100644 --- a/src/librustc/middle/dependency_format.rs +++ b/src/librustc/middle/dependency_format.rs @@ -157,7 +157,7 @@ fn calculate_type(sess: &session::Session, }); // Collect what we've got so far in the return vector. - let mut ret = range(1, sess.cstore.next_crate_num()).map(|i| { + let mut ret = (1..sess.cstore.next_crate_num()).map(|i| { match formats.get(&i).map(|v| *v) { v @ Some(cstore::RequireDynamic) => v, _ => None, diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index a236eb807ec..f0174c5b0c6 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -1229,8 +1229,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> { let mut insert = Vec::new(); if lifetimes.len() == 0 { let anon = self.cur_anon.get(); - for (i, a) in range(anon, - anon+expected).enumerate() { + for (i, a) in (anon..anon+expected).enumerate() { if anon_nums.contains(&a) { insert.push(i as u32); } diff --git a/src/librustc/middle/infer/region_inference/mod.rs b/src/librustc/middle/infer/region_inference/mod.rs index ca3806229c0..6a69fc5647c 100644 --- a/src/librustc/middle/infer/region_inference/mod.rs +++ b/src/librustc/middle/infer/region_inference/mod.rs @@ -983,7 +983,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> { } fn construct_var_data(&self) -> Vec { - range(0, self.num_vars() as uint).map(|_| { + (0..self.num_vars() as uint).map(|_| { VarData { // All nodes are initially classified as contracting; during // the expansion phase, we will shift the classification for @@ -1259,7 +1259,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> { let mut opt_graph = None; - for idx in range(0u, self.num_vars() as uint) { + for idx in 0u..self.num_vars() as uint { match var_data[idx].value { Value(_) => { /* Inference successful */ @@ -1316,7 +1316,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> { } } - range(0, self.num_vars() as uint).map(|idx| var_data[idx].value).collect() + (0..self.num_vars() as uint).map(|idx| var_data[idx].value).collect() } fn construct_graph(&self) -> RegionGraph { diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 030bf26699f..14e553f77dc 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -404,7 +404,7 @@ impl<'a> LifetimeContext<'a> { } fn check_lifetime_defs(&mut self, old_scope: Scope, lifetimes: &Vec) { - for i in range(0, lifetimes.len()) { + for i in 0..lifetimes.len() { let lifetime_i = &lifetimes[i]; let special_idents = [special_idents::static_lifetime]; @@ -417,7 +417,7 @@ impl<'a> LifetimeContext<'a> { } // It is a hard error to shadow a lifetime within the same scope. - for j in range(i + 1, lifetimes.len()) { + for j in i + 1..lifetimes.len() { let lifetime_j = &lifetimes[j]; if lifetime_i.lifetime.name == lifetime_j.lifetime.name { diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index 4d5f3d925b0..8005da507dc 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -595,7 +595,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { let mut i = 0; while i < candidates.len() { let is_dup = - range(0, candidates.len()) + (0..candidates.len()) .filter(|&j| i != j) .any(|j| self.candidate_should_be_dropped_in_favor_of(stack, &candidates[i], diff --git a/src/librustc/util/lev_distance.rs b/src/librustc/util/lev_distance.rs index ef086171810..fbd5cc5c74d 100644 --- a/src/librustc/util/lev_distance.rs +++ b/src/librustc/util/lev_distance.rs @@ -14,7 +14,7 @@ pub fn lev_distance(me: &str, t: &str) -> uint { if me.is_empty() { return t.chars().count(); } if t.is_empty() { return me.chars().count(); } - let mut dcol: Vec<_> = range(0, t.len() + 1).collect(); + let mut dcol: Vec<_> = (0..t.len() + 1).collect(); let mut t_last = 0; for (i, sc) in me.chars().enumerate() { diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index 65d41d86bc0..771363a8d05 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -714,7 +714,7 @@ pub fn run_passes(sess: &Session, cmd.args(&sess.target.target.options.pre_link_args[]); cmd.arg("-nostdlib"); - for index in range(0, trans.modules.len()) { + for index in 0..trans.modules.len() { cmd.arg(crate_output.with_extension(&format!("{}.o", index)[])); } @@ -824,7 +824,7 @@ pub fn run_passes(sess: &Session, let keep_numbered_bitcode = needs_crate_bitcode || (user_wants_bitcode && sess.opts.cg.codegen_units > 1); - for i in range(0, trans.modules.len()) { + for i in 0..trans.modules.len() { if modules_config.emit_obj { let ext = format!("{}.o", i); remove(sess, &crate_output.with_extension(&ext[])); diff --git a/src/librustc_trans/trans/_match.rs b/src/librustc_trans/trans/_match.rs index 77ae119a024..146239d0c48 100644 --- a/src/librustc_trans/trans/_match.rs +++ b/src/librustc_trans/trans/_match.rs @@ -606,7 +606,7 @@ fn extract_variant_args<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, val: ValueRef) -> ExtractedBlock<'blk, 'tcx> { let _icx = push_ctxt("match::extract_variant_args"); - let args = range(0, adt::num_args(repr, disr_val)).map(|i| { + let args = (0..adt::num_args(repr, disr_val)).map(|i| { adt::trans_field_ptr(bcx, repr, val, disr_val, i) }).collect(); @@ -653,8 +653,8 @@ fn extract_vec_elems<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, let vec_datum = match_datum(val, left_ty); let (base, len) = vec_datum.get_vec_base_and_len(bcx); let mut elems = vec![]; - elems.extend(range(0, before).map(|i| GEPi(bcx, base, &[i]))); - elems.extend(range(0, after).rev().map(|i| { + elems.extend((0..before).map(|i| GEPi(bcx, base, &[i]))); + elems.extend((0..after).rev().map(|i| { InBoundsGEP(bcx, base, &[ Sub(bcx, len, C_uint(bcx.ccx(), i + 1), DebugLoc::None) ]) @@ -768,7 +768,7 @@ fn pick_column_to_specialize(def_map: &DefMap, m: &[Match]) -> Option { }) }; - range(0, m[0].pats.len()) + (0..m[0].pats.len()) .filter(column_contains_any_nonwild_patterns) .map(|col| (col, column_score(m, col))) .max_by(|&(_, score)| score) @@ -1005,7 +1005,7 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, let adt_vals = if any_irrefutable_adt_pat(bcx.tcx(), m, col) { let repr = adt::represent_type(bcx.ccx(), left_ty); let arg_count = adt::num_args(&*repr, 0); - let field_vals: Vec = std::iter::range(0, arg_count).map(|ix| + let field_vals: Vec = (0..arg_count).map(|ix| adt::trans_field_ptr(bcx, &*repr, val, 0, ix) ).collect(); Some(field_vals) diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index 5a98bc4da36..1195b9f084b 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -1651,7 +1651,7 @@ fn copy_closure_args_to_allocas<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, wasn't a tuple?!") } }; - for j in range(0, args.len()) { + for j in 0..args.len() { let tuple_element_type = untupled_arg_types[j]; let tuple_element_datum = tuple_datum.get_element(bcx, diff --git a/src/librustc_trans/trans/callee.rs b/src/librustc_trans/trans/callee.rs index d038407791e..fc29c7071f2 100644 --- a/src/librustc_trans/trans/callee.rs +++ b/src/librustc_trans/trans/callee.rs @@ -905,7 +905,7 @@ fn trans_args_under_call_abi<'blk, 'tcx>( tuple_expr.id)); let repr = adt::represent_type(bcx.ccx(), tuple_type); let repr_ptr = &*repr; - for i in range(0, field_types.len()) { + for i in 0..field_types.len() { let arg_datum = tuple_lvalue_datum.get_element( bcx, field_types[i], diff --git a/src/librustc_trans/trans/context.rs b/src/librustc_trans/trans/context.rs index 16a93489f3f..12e79c407ec 100644 --- a/src/librustc_trans/trans/context.rs +++ b/src/librustc_trans/trans/context.rs @@ -310,7 +310,7 @@ impl<'tcx> SharedCrateContext<'tcx> { let (local_ccx, index) = self.local_ccxs .iter() - .zip(range(0, self.local_ccxs.len())) + .zip(0..self.local_ccxs.len()) .min_by(|&(local_ccx, _idx)| local_ccx.n_llvm_insns.get()) .unwrap(); CrateContext { diff --git a/src/librustc_trans/trans/foreign.rs b/src/librustc_trans/trans/foreign.rs index c989d2311be..5965d396e87 100644 --- a/src/librustc_trans/trans/foreign.rs +++ b/src/librustc_trans/trans/foreign.rs @@ -716,7 +716,7 @@ pub fn trans_rust_fn_with_foreign_abi<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, // Build up the arguments to the call to the rust function. // Careful to adapt for cases where the native convention uses // a pointer and Rust does not or vice versa. - for i in range(0, tys.fn_sig.inputs.len()) { + for i in 0..tys.fn_sig.inputs.len() { let rust_ty = tys.fn_sig.inputs[i]; let llrust_ty = tys.llsig.llarg_tys[i]; let rust_indirect = type_of::arg_is_indirect(ccx, rust_ty); diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 6e8dd6b0ae7..a382cfca0bd 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -314,7 +314,7 @@ fn create_substs_for_ast_path<'tcx>( match anon_regions { Ok(v) => v.into_iter().collect(), - Err(_) => range(0, expected_num_region_params) + Err(_) => (0..expected_num_region_params) .map(|_| ty::ReStatic).collect() // hokey } }; diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs index bc2f291007d..cb4c880717b 100644 --- a/src/librustc_typeck/check/_match.rs +++ b/src/librustc_typeck/check/_match.rs @@ -167,7 +167,7 @@ pub fn check_pat<'a, 'tcx>(pcx: &pat_ctxt<'a, 'tcx>, } ast::PatTup(ref elements) => { let element_tys: Vec<_> = - range(0, elements.len()).map(|_| fcx.infcx().next_ty_var()) + (0..elements.len()).map(|_| fcx.infcx().next_ty_var()) .collect(); let pat_ty = ty::mk_tup(tcx, element_tys.clone()); fcx.write_ty(pat.id, pat_ty); diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 517fd54a805..5067a72c881 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1871,7 +1871,7 @@ impl<'a, 'tcx> RegionScope for FnCtxt<'a, 'tcx> { fn anon_regions(&self, span: Span, count: uint) -> Result, Option>> { - Ok(range(0, count).map(|_| { + Ok((0..count).map(|_| { self.infcx().next_region_var(infer::MiscVariable(span)) }).collect()) } @@ -1903,7 +1903,7 @@ pub fn autoderef<'a, 'tcx, T, F>(fcx: &FnCtxt<'a, 'tcx>, lvalue_pref); let mut t = base_ty; - for autoderefs in range(0, fcx.tcx().sess.recursion_limit.get()) { + for autoderefs in 0..fcx.tcx().sess.recursion_limit.get() { let resolved_t = structurally_resolved_type(fcx, sp, t); if ty::type_is_error(resolved_t) { @@ -5107,7 +5107,7 @@ pub fn instantiate_path<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, // that the *default* type are expressed in terms of all prior // parameters, so we have to substitute as we go with the // partial substitution that we have built up. - for i in range(provided_len, desired.len()) { + for i in provided_len..desired.len() { let default = desired[i].default.unwrap(); let default = default.subst_spanned(fcx.tcx(), substs, Some(span)); substs.types.push(space, default); diff --git a/src/librustc_typeck/rscope.rs b/src/librustc_typeck/rscope.rs index b2d7d88cb11..7aaf56336a8 100644 --- a/src/librustc_typeck/rscope.rs +++ b/src/librustc_typeck/rscope.rs @@ -135,7 +135,7 @@ impl RegionScope for BindingRscope { count: uint) -> Result, Option>> { - Ok(range(0, count).map(|_| self.next_region()).collect()) + Ok((0..count).map(|_| self.next_region()).collect()) } } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 2d0b4947e97..b8ebbf8ff36 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1500,7 +1500,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item, items: &[clean::Item]) -> fmt::Result { try!(document(w, item)); - let mut indices = range(0, items.len()).filter(|i| { + let mut indices = (0..items.len()).filter(|i| { !cx.ignore_private_item(&items[*i]) }).collect::>(); diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 18949f1a267..c21d4c60f7b 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1326,7 +1326,7 @@ impl Stack { /// Compares this stack with an array of StackElements. pub fn is_equal_to(&self, rhs: &[StackElement]) -> bool { if self.stack.len() != rhs.len() { return false; } - for i in range(0, rhs.len()) { + for i in 0..rhs.len() { if self.get(i) != rhs[i] { return false; } } return true; @@ -1336,7 +1336,7 @@ impl Stack { /// the ones passed as parameter. pub fn starts_with(&self, rhs: &[StackElement]) -> bool { if self.stack.len() < rhs.len() { return false; } - for i in range(0, rhs.len()) { + for i in 0..rhs.len() { if self.get(i) != rhs[i] { return false; } } return true; @@ -1347,7 +1347,7 @@ impl Stack { pub fn ends_with(&self, rhs: &[StackElement]) -> bool { if self.stack.len() < rhs.len() { return false; } let offset = self.stack.len() - rhs.len(); - for i in range(0, rhs.len()) { + for i in 0..rhs.len() { if self.get(i + offset) != rhs[i] { return false; } } return true; 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 { /// 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, 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::(); 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::(); 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::(); 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::(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::(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::(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::>(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::>(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 = 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 { diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index 56ff455a02b..7f4f5e6ead6 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -770,7 +770,7 @@ impl<'a> MethodDef<'a> { let mut raw_fields = Vec::new(); // ~[[fields of self], // [fields of next Self arg], [etc]] let mut patterns = Vec::new(); - for i in range(0us, self_args.len()) { + for i in 0us..self_args.len() { let struct_path= cx.path(DUMMY_SP, vec!( type_ident )); let (pat, ident_expr) = trait_.create_struct_pattern(cx, diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 8ea9d6168ef..2a0a352f128 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -661,7 +661,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, sp: Span, name_ordering: Vec, names: HashMap>) -> P { - let arg_types: Vec<_> = range(0, args.len()).map(|_| None).collect(); + let arg_types: Vec<_> = (0..args.len()).map(|_| None).collect(); let mut cx = Context { ecx: ecx, args: args, diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 7e345a2d078..0f617302c92 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -665,7 +665,7 @@ fn mk_tt(cx: &ExtCtxt, tt: &ast::TokenTree) -> Vec> { } ref tt @ ast::TtToken(_, MatchNt(..)) => { let mut seq = vec![]; - for i in range(0, tt.len()) { + for i in 0..tt.len() { seq.push(tt.get_tt(i)); } mk_tts(cx, &seq[]) diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index a718cc597c4..e3211c7c337 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -392,7 +392,7 @@ pub fn parse(sess: &ParseSess, cur_eis.push(new_ei); } - let matches: Vec<_> = range(0, ei.matches.len()) + let matches: Vec<_> = (0..ei.matches.len()) .map(|_| Vec::new()).collect(); let ei_t = ei; cur_eis.push(box MatcherPos { diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index d466ece0998..a3a8bfecab1 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -172,7 +172,7 @@ impl Stats for [T] { let mut j = 0; // This inner loop applies `hi`/`lo` summation to each // partial so that the list of partial sums remains exact. - for i in range(0, partials.len()) { + for i in 0..partials.len() { let mut y: T = partials[i]; if x.abs() < y.abs() { mem::swap(&mut x, &mut y); diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout-fannkuch-redux.rs index cd65b8e7d81..e12a9e7cb16 100644 --- a/src/test/bench/shootout-fannkuch-redux.rs +++ b/src/test/bench/shootout-fannkuch-redux.rs @@ -49,7 +49,7 @@ fn rotate(x: &mut [i32]) { } fn next_permutation(perm: &mut [i32], count: &mut [i32]) { - for i in range(1, perm.len()) { + for i in 1..perm.len() { rotate(&mut perm[..i + 1]); let count_i = &mut count[i]; if *count_i >= i as i32 { diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 33d3327c6ab..2da276b722e 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -158,7 +158,7 @@ fn main() { // initialize each sequence sorter let sizes = vec!(1u,2,3,4,6,12,18); - let mut streams = range(0, sizes.len()).map(|_| { + let mut streams = (0..sizes.len()).map(|_| { Some(channel::()) }).collect::>(); let mut from_child = Vec::new(); diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 3717221e0f4..e6ef58cba35 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -199,8 +199,8 @@ fn is_board_unfeasible(board: u64, masks: &Vec>>) -> bool { // Filter the masks that we can prove to result to unfeasible board. fn filter_masks(masks: &mut Vec>>) { - for i in range(0, masks.len()) { - for j in range(0, (*masks)[i].len()) { + for i in 0..masks.len() { + for j in 0..(*masks)[i].len() { masks[i][j] = (*masks)[i][j].iter().map(|&m| m) .filter(|&m| !is_board_unfeasible(m, masks)) diff --git a/src/test/compile-fail/issue-14303-fncall.rs b/src/test/compile-fail/issue-14303-fncall.rs index 0ec64ba6a3f..a7adaacc0a5 100644 --- a/src/test/compile-fail/issue-14303-fncall.rs +++ b/src/test/compile-fail/issue-14303-fncall.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - range(0, 4) + (0..4) .map(|x| x * 2) .collect::>() //~^ ERROR lifetime parameters must be declared prior to type parameters diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index 56eb7486c92..6ffc12b943c 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -29,7 +29,7 @@ fn foo(name: String, samples_chan: Sender) { // `box() (...)` syntax is needed to make pretty printer converge in one try: let callback: SamplesFn = box() (move |buffer| { - for i in range(0u, buffer.len()) { + for i in 0u..buffer.len() { println!("{}: {}", i, buffer[i]) } }); diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs index cd97c34f8c6..ce807500138 100644 --- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs +++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs @@ -37,7 +37,7 @@ pub fn main() { box BarStruct{ x: 2 } as Box ); - for i in range(0u, foos.len()) { + for i in 0u..foos.len() { assert_eq!(i, foos[i].foo()); } }