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/libcoretest | |
| parent | 7d661af9c86566088f7dbaeee25143ecde673b75 (diff) | |
| download | rust-efc97a51ffc798247e36156cf8e2d175bf509018.tar.gz rust-efc97a51ffc798247e36156cf8e2d175bf509018.zip | |
convert remaining `range(a, b)` to `a..b`
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/iter.rs | 30 | ||||
| -rw-r--r-- | src/libcoretest/str.rs | 2 |
2 files changed, 16 insertions, 16 deletions
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<int>>() == vec![13i, 12, 11]); + assert!((11i..14).rev().collect::<Vec<int>>() == vec![13i, 12, 11]); for _ in (10i..0).rev() { panic!("unreachable"); } - assert!(range(11u, 14).rev().collect::<Vec<uint>>() == vec![13u, 12, 11]); + assert!((11u..14).rev().collect::<Vec<uint>>() == 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<int>>() == vec![0i, 1, 2, 3, 4]); - assert!(range(-10i, -1).collect::<Vec<int>>() == + assert!((0i..5).collect::<Vec<int>>() == vec![0i, 1, 2, 3, 4]); + assert!((-10i..-1).collect::<Vec<int>>() == vec![-10, -9, -8, -7, -6, -5, -4, -3, -2]); - assert!(range(0i, 5).rev().collect::<Vec<int>>() == 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<int>>() == 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])); } |
