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/libcoretest | |
| 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/libcoretest')
| -rw-r--r-- | src/libcoretest/iter.rs | 8 | ||||
| -rw-r--r-- | src/libcoretest/option.rs | 6 | ||||
| -rw-r--r-- | src/libcoretest/result.rs | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index 9481245f120..da2b053efda 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -731,12 +731,12 @@ fn test_random_access_cycle() { #[test] fn test_double_ended_range() { assert!(range(11i, 14).rev().collect::<Vec<int>>() == vec![13i, 12, 11]); - for _ in range(10i, 0).rev() { + for _ in (10i..0).rev() { panic!("unreachable"); } assert!(range(11u, 14).rev().collect::<Vec<uint>>() == vec![13u, 12, 11]); - for _ in range(10u, 0).rev() { + for _ in (10u..0).rev() { panic!("unreachable"); } } @@ -883,7 +883,7 @@ fn test_fuse() { #[bench] fn bench_rposition(b: &mut Bencher) { - let it: Vec<uint> = range(0u, 300).collect(); + let it: Vec<uint> = (0u..300).collect(); b.iter(|| { it.iter().rposition(|&x| x <= 150); }); @@ -900,7 +900,7 @@ fn bench_skip_while(b: &mut Bencher) { #[bench] fn bench_multiple_take(b: &mut Bencher) { - let mut it = range(0u, 42).cycle(); + let mut it = (0u..42).cycle(); b.iter(|| { let n = it.next().unwrap(); for _ in range(0u, n) { diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs index 1169f910238..bb9d1524786 100644 --- a/src/libcoretest/option.rs +++ b/src/libcoretest/option.rs @@ -223,13 +223,13 @@ fn test_ord() { /* FIXME(#20575) #[test] fn test_collect() { - let v: Option<Vec<int>> = range(0i, 0).map(|_| Some(0i)).collect(); + let v: Option<Vec<int>> = (0i..0).map(|_| Some(0i)).collect(); assert!(v == Some(vec![])); - let v: Option<Vec<int>> = range(0i, 3).map(|x| Some(x)).collect(); + let v: Option<Vec<int>> = (0i..3).map(|x| Some(x)).collect(); assert!(v == Some(vec![0, 1, 2])); - let v: Option<Vec<int>> = range(0i, 3).map(|x| { + let v: Option<Vec<int>> = (0i..3).map(|x| { if x > 1 { None } else { Some(x) } }).collect(); assert!(v == None); diff --git a/src/libcoretest/result.rs b/src/libcoretest/result.rs index daccb709890..d36228fa3d7 100644 --- a/src/libcoretest/result.rs +++ b/src/libcoretest/result.rs @@ -68,13 +68,13 @@ pub fn test_impl_map_err() { /* FIXME(#20575) #[test] fn test_collect() { - let v: Result<Vec<int>, ()> = range(0i, 0).map(|_| Ok::<int, ()>(0)).collect(); + let v: Result<Vec<int>, ()> = (0i..0).map(|_| Ok::<int, ()>(0)).collect(); assert!(v == Ok(vec![])); - let v: Result<Vec<int>, ()> = range(0i, 3).map(|x| Ok::<int, ()>(x)).collect(); + let v: Result<Vec<int>, ()> = (0i..3).map(|x| Ok::<int, ()>(x)).collect(); assert!(v == Ok(vec![0, 1, 2])); - let v: Result<Vec<int>, int> = range(0i, 3).map(|x| { + let v: Result<Vec<int>, int> = (0i..3).map(|x| { if x > 1 { Err(x) } else { Ok(x) } }).collect(); assert!(v == Err(2)); |
