about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2013-09-15 00:44:48 -0400
committerDaniel Micay <danielmicay@gmail.com>2013-09-15 00:44:48 -0400
commita05c4a1e5f9e2c5cc718abb8aa035af565fe8b01 (patch)
treeeba63d5914d3a43534f2bf388375c4a08e9d70ad
parent6e3d5c62e79026920d09833889ea837b19b0a9d0 (diff)
downloadrust-a05c4a1e5f9e2c5cc718abb8aa035af565fe8b01.tar.gz
rust-a05c4a1e5f9e2c5cc718abb8aa035af565fe8b01.zip
remove old internal iterator range tests
The cases they test are well covered in the `std::iter` tests.
-rw-r--r--src/test/run-pass/num-range-rev.rs126
-rw-r--r--src/test/run-pass/num-range.rs128
2 files changed, 0 insertions, 254 deletions
diff --git a/src/test/run-pass/num-range-rev.rs b/src/test/run-pass/num-range-rev.rs
deleted file mode 100644
index 05b84c059c4..00000000000
--- a/src/test/run-pass/num-range-rev.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::int;
-use std::uint;
-
-fn uint_range(lo: uint, hi: uint, it: &fn(uint) -> bool) -> bool {
-    range(lo, hi).advance(it)
-}
-
-fn int_range(lo: int,  hi: int, it: &fn(int) -> bool) -> bool {
-    range(lo, hi).advance(it)
-}
-
-fn uint_range_rev(hi: uint, lo: uint, it: &fn(uint) -> bool) -> bool {
-    range(lo, hi).invert().advance(it)
-}
-
-fn int_range_rev(hi: int,  lo: int, it: &fn(int) -> bool) -> bool {
-    range(lo, hi).invert().advance(it)
-}
-
-fn int_range_step(a: int, b: int, step: int, it: &fn(int) -> bool) -> bool {
-    std::iter::range_step(a, b, step).advance(it)
-}
-
-fn uint_range_step(a: uint, b: uint, step: int, it: &fn(uint) -> bool) -> bool {
-    std::iter::range_step(a, b, step).advance(it)
-}
-
-
-pub fn main() {
-    // int and uint have same result for
-    //   Sum{100 > i >= 2} == (Sum{1 <= i <= 99} - 1) == n*(n+1)/2 - 1 for n=99
-    let mut sum = 0u;
-    do uint_range_rev(100, 2) |i| {
-        sum += i;
-        true
-    };
-    assert_eq!(sum, 4949);
-
-    let mut sum = 0i;
-    do int_range_rev(100, 2) |i| {
-        sum += i;
-        true
-    };
-    assert_eq!(sum, 4949);
-
-
-    // elements are visited in correct order
-    let primes = [2,3,5,7,11];
-    let mut prod = 1i;
-    do uint_range_rev(5, 0) |i| {
-        printfln!("uint 4 downto 0: %u", i);
-        prod *= int::pow(primes[i], i);
-        true
-    };
-    assert_eq!(prod, 11*11*11*11*7*7*7*5*5*3*1);
-    let mut prod = 1i;
-    do int_range_rev(5, 0) |i| {
-        printfln!("int 4 downto 0: %d", i);
-        prod *= int::pow(primes[i], i as uint);
-        true
-    };
-    assert_eq!(prod, 11*11*11*11*7*7*7*5*5*3*1);
-
-
-    // range and range_rev are symmetric.
-    let mut sum_up = 0u;
-    do uint_range(10, 30) |i| {
-        sum_up += i;
-        true
-    };
-    let mut sum_down = 0u;
-    do uint_range_rev(30, 10) |i| {
-        sum_down += i;
-        true
-    };
-    assert_eq!(sum_up, sum_down);
-
-    let mut sum_up = 0;
-    do int_range(-20, 10) |i| {
-        sum_up += i;
-        true
-    };
-    let mut sum_down = 0;
-    do int_range_rev(10, -20) |i| {
-        sum_down += i;
-        true
-    };
-    assert_eq!(sum_up, sum_down);
-
-
-    // empty ranges
-    do int_range_rev(10, 10) |_| {
-        fail!("range should be empty when start == stop");
-        true
-    };
-
-    do uint_range_rev(0, 1) |_| {
-        fail!("range should be empty when start-1 underflows");
-        true
-    };
-
-    // range iterations do not wrap/underflow
-    let mut uflo_loop_visited = ~[];
-    do int_range_step(int::min_value+15, int::min_value, -4) |x| {
-        uflo_loop_visited.push(x - int::min_value);
-        true
-    };
-    assert_eq!(uflo_loop_visited, ~[15, 11, 7, 3]);
-
-    let mut uflo_loop_visited = ~[];
-    do uint_range_step(uint::min_value+15, uint::min_value, -4) |x| {
-        uflo_loop_visited.push(x - uint::min_value);
-        true
-    };
-    assert_eq!(uflo_loop_visited, ~[15, 11, 7, 3]);
-}
diff --git a/src/test/run-pass/num-range.rs b/src/test/run-pass/num-range.rs
deleted file mode 100644
index 5f87d01719e..00000000000
--- a/src/test/run-pass/num-range.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::int;
-use std::uint;
-
-fn uint_range(lo: uint, hi: uint, it: &fn(uint) -> bool) -> bool {
-    range(lo, hi).advance(it)
-}
-
-fn int_range(lo: int, hi: int, it: &fn(int) -> bool) -> bool {
-    range(lo, hi).advance(it)
-}
-
-fn int_range_step(a: int, b: int, step: int, it: &fn(int) -> bool) -> bool {
-    std::iter::range_step(a, b, step).advance(it)
-}
-
-fn uint_range_step(a: uint, b: uint, s: int, it: &fn(uint) -> bool) -> bool {
-    std::iter::range_step(a, b, s).advance(it)
-}
-
-pub fn main() {
-    println("num-range start");
-    // int and uint have same result for
-    //   Sum{2 <= i < 100} == (Sum{1 <= i <= 99} - 1) == n*(n+1)/2 - 1 for n=99
-    let mut sum = 0u;
-    do uint_range(2, 100) |i| {
-        sum += i;
-        true
-    };
-    assert_eq!(sum, 4949);
-
-    let mut sum = 0i;
-    do int_range(2, 100) |i| {
-        sum += i;
-        true
-    };
-    assert_eq!(sum, 4949);
-
-
-    // elements are visited in correct order
-    let primes = [2,3,5,7];
-    let mut prod = 1i;
-    do uint_range(0, 4) |i| {
-        prod *= int::pow(primes[i], i);
-        true
-    };
-    assert_eq!(prod, 1*3*5*5*7*7*7);
-    let mut prod = 1i;
-    do int_range(0, 4) |i| {
-        prod *= int::pow(primes[i], i as uint);
-        true
-    };
-    assert_eq!(prod, 1*3*5*5*7*7*7);
-
-
-    // empty ranges
-    do int_range(10, 10) |_| {
-        fail!("range should be empty when start == stop");
-        true
-    };
-
-    do uint_range(10, 10) |_| {
-        fail!("range should be empty when start == stop");
-        true
-    };
-
-
-    // range iterations do not wrap/overflow
-    let mut oflo_loop_visited = ~[];
-    do uint_range_step(uint::max_value-15, uint::max_value, 4) |x| {
-        oflo_loop_visited.push(uint::max_value - x);
-        true
-    };
-    assert_eq!(oflo_loop_visited, ~[15, 11, 7, 3]);
-
-    let mut oflo_loop_visited = ~[];
-    do int_range_step(int::max_value-15, int::max_value, 4) |x| {
-        oflo_loop_visited.push(int::max_value - x);
-        true
-    };
-    assert_eq!(oflo_loop_visited, ~[15, 11, 7, 3]);
-
-
-    // range_step never passes nor visits the stop element
-    do int_range_step(0, 21, 3) |x| {
-        assert!(x < 21);
-        true
-    };
-
-    // range_step_inclusive will never pass stop element, and may skip it.
-    let mut saw21 = false;
-    for x in std::iter::range_step_inclusive(0, 21, 4) {
-        assert!(x <= 21);
-        if x == 21 { saw21 = true; }
-    }
-    assert!(!saw21);
-    let mut saw21 = false;
-    for x in std::iter::range_step_inclusive(0, 21, 4) {
-        assert!(x <= 21);
-        if x == 21 { saw21 = true; }
-    }
-    assert!(!saw21);
-
-    // range_step_inclusive will never pass stop element, but may visit it.
-    let mut saw21 = false;
-    for x in std::iter::range_step_inclusive(0, 21, 3) {
-        assert!(x <= 21);
-        printfln!("saw: %u", x);
-        if x == 21 { saw21 = true; }
-    }
-    assert!(saw21);
-    let mut saw21 = false;
-    for x in std::iter::range_step_inclusive(0, 21, 3) {
-        assert!(x <= 21);
-        if x == 21 { saw21 = true; }
-    }
-    assert!(saw21);
-
-}