From 7d661af9c86566088f7dbaeee25143ecde673b75 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 26 Jan 2015 15:46:12 -0500 Subject: `for x in range(a, b)` -> `for x in a..b` sed -i 's/in range(\([^,]*\), *\([^()]*\))/in \1\.\.\2/g' **/*.rs --- src/libserialize/collection_impls.rs | 16 ++++++++-------- src/libserialize/hex.rs | 4 ++-- src/libserialize/json.rs | 4 ++-- src/libserialize/serialize.rs | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/libserialize') diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index 10698259739..8b39d91ffae 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.rs @@ -36,7 +36,7 @@ impl Decodable for DList { fn decode(d: &mut D) -> Result, D::Error> { d.read_seq(|d, len| { let mut list = DList::new(); - for i in range(0u, len) { + for i in 0u..len { list.push_back(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } Ok(list) @@ -59,7 +59,7 @@ impl Decodable for RingBuf { fn decode(d: &mut D) -> Result, D::Error> { d.read_seq(|d, len| { let mut deque: RingBuf = RingBuf::new(); - for i in range(0u, len) { + for i in 0u..len { deque.push_back(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } Ok(deque) @@ -91,7 +91,7 @@ impl< fn decode(d: &mut D) -> Result, D::Error> { d.read_map(|d, len| { let mut map = BTreeMap::new(); - for i in range(0u, len) { + for i in 0u..len { let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d))); let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d))); map.insert(key, val); @@ -122,7 +122,7 @@ impl< fn decode(d: &mut D) -> Result, D::Error> { d.read_seq(|d, len| { let mut set = BTreeSet::new(); - for i in range(0u, len) { + for i in 0u..len { set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } Ok(set) @@ -148,7 +148,7 @@ impl< fn decode(d: &mut D) -> Result, D::Error> { let bits = try!(d.read_uint()); let mut set = EnumSet::new(); - for bit in range(0, uint::BITS) { + for bit in 0..uint::BITS { if bits & (1 << bit) != 0 { set.insert(CLike::from_uint(1 << bit)); } @@ -186,7 +186,7 @@ impl Decodable for HashMap d.read_map(|d, len| { let state = Default::default(); let mut map = HashMap::with_capacity_and_hash_state(len, state); - for i in range(0u, len) { + for i in 0u..len { let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d))); let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d))); map.insert(key, val); @@ -222,7 +222,7 @@ impl Decodable for HashSet d.read_seq(|d, len| { let state = Default::default(); let mut set = HashSet::with_capacity_and_hash_state(len, state); - for i in range(0u, len) { + for i in 0u..len { set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } Ok(set) @@ -246,7 +246,7 @@ impl Decodable for VecMap { fn decode(d: &mut D) -> Result, D::Error> { d.read_map(|d, len| { let mut map = VecMap::new(); - for i in range(0u, len) { + for i in 0u..len { let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d))); let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d))); map.insert(key, val); diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs index 33c5d7402f0..91c2561753b 100644 --- a/src/libserialize/hex.rs +++ b/src/libserialize/hex.rs @@ -185,14 +185,14 @@ mod tests { #[test] pub fn test_to_hex_all_bytes() { - for i in range(0u, 256) { + for i in 0u..256 { assert_eq!([i as u8].to_hex(), format!("{:02x}", i as uint)); } } #[test] pub fn test_from_hex_all_bytes() { - for i in range(0u, 256) { + for i in 0u..256 { let ii: &[u8] = &[i as u8]; assert_eq!(format!("{:02x}", i as uint).from_hex() .unwrap(), diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index dad72fbd0e3..18949f1a267 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -3513,7 +3513,7 @@ mod tests { } // Test up to 4 spaces of indents (more?) - for i in range(0, 4u) { + for i in 0..4u { let mut writer = Vec::new(); write!(&mut writer, "{}", super::as_pretty_json(&json).indent(i)).unwrap(); @@ -3982,7 +3982,7 @@ mod tests { fn big_json() -> string::String { let mut src = "[\n".to_string(); - for _ in range(0i, 500) { + for _ in 0i..500 { src.push_str(r#"{ "a": true, "b": null, "c":3.1415, "d": "Hello world", "e": \ [1,2,3]},"#); } diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index e93d71a9dff..f963d0ce813 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -461,7 +461,7 @@ impl Decodable for Vec { fn decode(d: &mut D) -> Result, D::Error> { d.read_seq(|d, len| { let mut v = Vec::with_capacity(len); - for i in range(0, len) { + for i in 0..len { v.push(try!(d.read_seq_elt(i, |d| Decodable::decode(d)))); } Ok(v) @@ -641,7 +641,7 @@ impl DecoderHelpers for D { { self.read_seq(|this, len| { let mut v = Vec::with_capacity(len); - for i in range(0, len) { + for i in 0..len { v.push(try!(this.read_seq_elt(i, |this| f(this)))); } Ok(v) -- cgit 1.4.1-3-g733a5