for x in range(a, b)
-> for x in a..b
sed -i 's/in range(\([^,]*\), *\([^()]*\))/in \1\.\.\2/g' **/*.rs
This commit is contained in:
parent
c300d681bd
commit
7d661af9c8
@ -37,7 +37,7 @@
|
||||
//!
|
||||
//! let five = Arc::new(5i);
|
||||
//!
|
||||
//! for _ in range(0u, 10) {
|
||||
//! for _ in 0u..10 {
|
||||
//! let five = five.clone();
|
||||
//!
|
||||
//! Thread::spawn(move || {
|
||||
@ -54,7 +54,7 @@
|
||||
//!
|
||||
//! let five = Arc::new(Mutex::new(5i));
|
||||
//!
|
||||
//! for _ in range(0u, 10) {
|
||||
//! for _ in 0u..10 {
|
||||
//! let five = five.clone();
|
||||
//!
|
||||
//! Thread::spawn(move || {
|
||||
@ -98,7 +98,7 @@ use heap::deallocate;
|
||||
/// let numbers: Vec<_> = (0..100u32).map(|i| i as f32).collect();
|
||||
/// let shared_numbers = Arc::new(numbers);
|
||||
///
|
||||
/// for _ in range(0u, 10) {
|
||||
/// for _ in 0u..10 {
|
||||
/// let child_numbers = shared_numbers.clone();
|
||||
///
|
||||
/// Thread::spawn(move || {
|
||||
|
@ -311,7 +311,7 @@ impl Arena {
|
||||
#[test]
|
||||
fn test_arena_destructors() {
|
||||
let arena = Arena::new();
|
||||
for i in range(0u, 10) {
|
||||
for i in 0u..10 {
|
||||
// Arena allocate something with drop glue to make sure it
|
||||
// doesn't leak.
|
||||
arena.alloc(|| Rc::new(i));
|
||||
@ -340,7 +340,7 @@ fn test_arena_alloc_nested() {
|
||||
fn test_arena_destructors_fail() {
|
||||
let arena = Arena::new();
|
||||
// Put some stuff in the arena.
|
||||
for i in range(0u, 10) {
|
||||
for i in 0u..10 {
|
||||
// Arena allocate something with drop glue to make sure it
|
||||
// doesn't leak.
|
||||
arena.alloc(|| { Rc::new(i) });
|
||||
@ -410,7 +410,7 @@ impl<T> TypedArenaChunk<T> {
|
||||
// Destroy all the allocated objects.
|
||||
if intrinsics::needs_drop::<T>() {
|
||||
let mut start = self.start();
|
||||
for _ in range(0, len) {
|
||||
for _ in 0..len {
|
||||
ptr::read(start as *const T); // run the destructor on the pointer
|
||||
start = start.offset(mem::size_of::<T>() as int)
|
||||
}
|
||||
@ -530,7 +530,7 @@ mod tests {
|
||||
#[test]
|
||||
pub fn test_copy() {
|
||||
let arena = TypedArena::new();
|
||||
for _ in range(0u, 100000) {
|
||||
for _ in 0u..100000 {
|
||||
arena.alloc(Point {
|
||||
x: 1,
|
||||
y: 2,
|
||||
@ -585,7 +585,7 @@ mod tests {
|
||||
#[test]
|
||||
pub fn test_noncopy() {
|
||||
let arena = TypedArena::new();
|
||||
for _ in range(0u, 100000) {
|
||||
for _ in 0u..100000 {
|
||||
arena.alloc(Noncopy {
|
||||
string: "hello world".to_string(),
|
||||
array: vec!( 1, 2, 3, 4, 5 ),
|
||||
|
@ -24,7 +24,7 @@ pub fn insert_rand_n<M, I, R>(n: uint,
|
||||
// setup
|
||||
let mut rng = rand::weak_rng();
|
||||
|
||||
for _ in range(0, n) {
|
||||
for _ in 0..n {
|
||||
insert(map, rng.gen::<uint>() % n);
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ pub fn insert_seq_n<M, I, R>(n: uint,
|
||||
R: FnMut(&mut M, uint),
|
||||
{
|
||||
// setup
|
||||
for i in range(0u, n) {
|
||||
for i in 0u..n {
|
||||
insert(map, i * 2);
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ pub fn find_seq_n<M, T, I, F>(n: uint,
|
||||
F: FnMut(&M, uint) -> T,
|
||||
{
|
||||
// setup
|
||||
for i in range(0u, n) {
|
||||
for i in 0u..n {
|
||||
insert(map, i);
|
||||
}
|
||||
|
||||
|
@ -68,7 +68,7 @@
|
||||
//! // Simple primality tests below our max bound
|
||||
//! let print_primes = 20;
|
||||
//! print!("The primes below {} are: ", print_primes);
|
||||
//! for x in range(0, print_primes) {
|
||||
//! for x in 0..print_primes {
|
||||
//! if primes.contains(&x) {
|
||||
//! print!("{} ", x);
|
||||
//! }
|
||||
@ -104,7 +104,7 @@ type MatchWords<'a> = Chain<Enumerate<Blocks<'a>>, Skip<Take<Enumerate<Repeat<u3
|
||||
|
||||
fn reverse_bits(byte: u8) -> u8 {
|
||||
let mut result = 0;
|
||||
for i in range(0, u8::BITS) {
|
||||
for i in 0..u8::BITS {
|
||||
result |= ((byte >> i) & 1) << (u8::BITS - 1 - i);
|
||||
}
|
||||
result
|
||||
@ -320,7 +320,7 @@ impl Bitv {
|
||||
|
||||
bitv.nbits = len;
|
||||
|
||||
for i in range(0, complete_words) {
|
||||
for i in 0..complete_words {
|
||||
bitv.storage.push(
|
||||
((reverse_bits(bytes[i * 4 + 0]) as u32) << 0) |
|
||||
((reverse_bits(bytes[i * 4 + 1]) as u32) << 8) |
|
||||
@ -353,7 +353,7 @@ impl Bitv {
|
||||
/// ```
|
||||
pub fn from_fn<F>(len: uint, mut f: F) -> Bitv where F: FnMut(uint) -> bool {
|
||||
let mut bitv = Bitv::from_elem(len, false);
|
||||
for i in range(0u, len) {
|
||||
for i in 0u..len {
|
||||
bitv.set(i, f(i));
|
||||
}
|
||||
bitv
|
||||
@ -830,7 +830,7 @@ impl Bitv {
|
||||
|
||||
// Fill in words after the old tail word
|
||||
let stop_idx = cmp::min(self.storage.len(), new_nblocks);
|
||||
for idx in range(old_last_word + 1, stop_idx) {
|
||||
for idx in old_last_word + 1..stop_idx {
|
||||
self.storage[idx] = full_value;
|
||||
}
|
||||
|
||||
@ -2232,12 +2232,12 @@ mod tests {
|
||||
#[test]
|
||||
fn test_equal_sneaky_big() {
|
||||
let mut a = Bitv::from_elem(100, false);
|
||||
for i in range(0u, 100) {
|
||||
for i in 0u..100 {
|
||||
a.set(i, true);
|
||||
}
|
||||
|
||||
let mut b = Bitv::from_elem(100, true);
|
||||
for i in range(0u, 100) {
|
||||
for i in 0u..100 {
|
||||
b.set(i, true);
|
||||
}
|
||||
|
||||
@ -2526,7 +2526,7 @@ mod bitv_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = 0 as uint;
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv |= 1 << ((r.next_u32() as uint) % u32::BITS);
|
||||
}
|
||||
black_box(&bitv);
|
||||
@ -2538,7 +2538,7 @@ mod bitv_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = Bitv::from_elem(BENCH_BITS, false);
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
|
||||
}
|
||||
black_box(&bitv);
|
||||
@ -2550,7 +2550,7 @@ mod bitv_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = Bitv::from_elem(BENCH_BITS, false);
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv.set((r.next_u32() as uint) % BENCH_BITS, r.gen());
|
||||
}
|
||||
black_box(&bitv);
|
||||
@ -2562,7 +2562,7 @@ mod bitv_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = Bitv::from_elem(u32::BITS, false);
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv.set((r.next_u32() as uint) % u32::BITS, true);
|
||||
}
|
||||
black_box(&bitv);
|
||||
@ -2583,7 +2583,7 @@ mod bitv_bench {
|
||||
let bitv = Bitv::from_elem(u32::BITS, false);
|
||||
b.iter(|| {
|
||||
let mut sum = 0u;
|
||||
for _ in range(0u, 10) {
|
||||
for _ in 0u..10 {
|
||||
for pres in bitv.iter() {
|
||||
sum += pres as uint;
|
||||
}
|
||||
@ -3021,7 +3021,7 @@ mod bitv_set_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = BitvSet::new();
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv.insert((r.next_u32() as uint) % u32::BITS);
|
||||
}
|
||||
black_box(&bitv);
|
||||
@ -3033,7 +3033,7 @@ mod bitv_set_bench {
|
||||
let mut r = rng();
|
||||
let mut bitv = BitvSet::new();
|
||||
b.iter(|| {
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
bitv.insert((r.next_u32() as uint) % BENCH_BITS);
|
||||
}
|
||||
black_box(&bitv);
|
||||
|
@ -1601,39 +1601,39 @@ mod test {
|
||||
let size = 10000u;
|
||||
assert_eq!(map.len(), 0);
|
||||
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(map.insert(i, 10*i), None);
|
||||
assert_eq!(map.len(), i + 1);
|
||||
}
|
||||
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(map.get(&i).unwrap(), &(i*10));
|
||||
}
|
||||
|
||||
for i in range(size, size*2) {
|
||||
for i in size..size*2 {
|
||||
assert_eq!(map.get(&i), None);
|
||||
}
|
||||
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(map.insert(i, 100*i), Some(10*i));
|
||||
assert_eq!(map.len(), size);
|
||||
}
|
||||
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(map.get(&i).unwrap(), &(i*100));
|
||||
}
|
||||
|
||||
for i in range(0, size/2) {
|
||||
for i in 0..size/2 {
|
||||
assert_eq!(map.remove(&(i*2)), Some(i*200));
|
||||
assert_eq!(map.len(), size - i - 1);
|
||||
}
|
||||
|
||||
for i in range(0, size/2) {
|
||||
for i in 0..size/2 {
|
||||
assert_eq!(map.get(&(2*i)), None);
|
||||
assert_eq!(map.get(&(2*i+1)).unwrap(), &(i*200 + 100));
|
||||
}
|
||||
|
||||
for i in range(0, size/2) {
|
||||
for i in 0..size/2 {
|
||||
assert_eq!(map.remove(&(2*i)), None);
|
||||
assert_eq!(map.remove(&(2*i+1)), Some(i*200 + 100));
|
||||
assert_eq!(map.len(), size/2 - i - 1);
|
||||
@ -1664,7 +1664,7 @@ mod test {
|
||||
let mut map: BTreeMap<uint, uint> = (0..size).map(|i| (i, i)).collect();
|
||||
|
||||
fn test<T>(size: uint, mut iter: T) where T: Iterator<Item=(uint, uint)> {
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(iter.size_hint(), (size - i, Some(size - i)));
|
||||
assert_eq!(iter.next().unwrap(), (i, i));
|
||||
}
|
||||
@ -1684,7 +1684,7 @@ mod test {
|
||||
let mut map: BTreeMap<uint, uint> = (0..size).map(|i| (i, i)).collect();
|
||||
|
||||
fn test<T>(size: uint, mut iter: T) where T: Iterator<Item=(uint, uint)> {
|
||||
for i in range(0, size) {
|
||||
for i in 0..size {
|
||||
assert_eq!(iter.size_hint(), (size - i, Some(size - i)));
|
||||
assert_eq!(iter.next().unwrap(), (size - i - 1, size - i - 1));
|
||||
}
|
||||
@ -1705,12 +1705,12 @@ mod test {
|
||||
|
||||
fn test<T>(size: uint, mut iter: T)
|
||||
where T: Iterator<Item=(uint, uint)> + DoubleEndedIterator {
|
||||
for i in range(0, size / 4) {
|
||||
for i in 0..size / 4 {
|
||||
assert_eq!(iter.size_hint(), (size - i * 2, Some(size - i * 2)));
|
||||
assert_eq!(iter.next().unwrap(), (i, i));
|
||||
assert_eq!(iter.next_back().unwrap(), (size - i - 1, size - i - 1));
|
||||
}
|
||||
for i in range(size / 4, size * 3 / 4) {
|
||||
for i in size / 4..size * 3 / 4 {
|
||||
assert_eq!(iter.size_hint(), (size * 3 / 4 - i, Some(size * 3 / 4 - i)));
|
||||
assert_eq!(iter.next().unwrap(), (i, i));
|
||||
}
|
||||
@ -1766,8 +1766,8 @@ mod test {
|
||||
let size = 200u;
|
||||
let map: BTreeMap<uint, uint> = (0..size).map(|i| (i, i)).collect();
|
||||
|
||||
for i in range(0, size) {
|
||||
for j in range(i, size) {
|
||||
for i in 0..size {
|
||||
for j in i..size {
|
||||
let mut kvs = map.range(Included(&i), Included(&j)).map(|(&k, &v)| (k, v));
|
||||
let mut pairs = range_inclusive(i, j).map(|i| (i, i));
|
||||
|
||||
@ -1917,7 +1917,7 @@ mod bench {
|
||||
let mut map = BTreeMap::<uint, uint>::new();
|
||||
let mut rng = weak_rng();
|
||||
|
||||
for _ in range(0, size) {
|
||||
for _ in 0..size {
|
||||
map.insert(rng.gen(), rng.gen());
|
||||
}
|
||||
|
||||
|
@ -501,7 +501,7 @@ impl<K: Clone, V: Clone> Clone for Node<K, V> {
|
||||
/// let mut small_node = Node::make_leaf_root(3);
|
||||
/// let mut large_node = Node::make_leaf_root(100);
|
||||
///
|
||||
/// for i in range(0, 100) {
|
||||
/// for i in 0..100 {
|
||||
/// // Insert to the end
|
||||
/// large_node.edge_handle(i).insert_as_leaf(i, i);
|
||||
/// }
|
||||
|
@ -592,7 +592,7 @@ impl<T> DList<T> {
|
||||
// instead of skipping using .skip() (which creates a new struct),
|
||||
// we skip manually so we can access the head field without
|
||||
// depending on implementation details of Skip
|
||||
for _ in range(0, at - 1) {
|
||||
for _ in 0..at - 1 {
|
||||
iter.next();
|
||||
}
|
||||
iter.head
|
||||
@ -1070,10 +1070,10 @@ mod tests {
|
||||
let mut n = m.split_off(2);
|
||||
assert_eq!(m.len(), 2);
|
||||
assert_eq!(n.len(), 3);
|
||||
for elt in range(1i, 3) {
|
||||
for elt in 1i..3 {
|
||||
assert_eq!(m.pop_front(), Some(elt));
|
||||
}
|
||||
for elt in range(3i, 6) {
|
||||
for elt in 3i..6 {
|
||||
assert_eq!(n.pop_front(), Some(elt));
|
||||
}
|
||||
}
|
||||
@ -1084,10 +1084,10 @@ mod tests {
|
||||
let mut n = m.split_off(4);
|
||||
assert_eq!(m.len(), 4);
|
||||
assert_eq!(n.len(), 1);
|
||||
for elt in range(1i, 5) {
|
||||
for elt in 1i..5 {
|
||||
assert_eq!(m.pop_front(), Some(elt));
|
||||
}
|
||||
for elt in range(5i, 6) {
|
||||
for elt in 5i..6 {
|
||||
assert_eq!(n.pop_front(), Some(elt));
|
||||
}
|
||||
}
|
||||
@ -1325,7 +1325,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_fuzz() {
|
||||
for _ in range(0u, 25) {
|
||||
for _ in 0u..25 {
|
||||
fuzz_test(3);
|
||||
fuzz_test(16);
|
||||
fuzz_test(189);
|
||||
@ -1347,7 +1347,7 @@ mod tests {
|
||||
fn fuzz_test(sz: int) {
|
||||
let mut m: DList<int> = DList::new();
|
||||
let mut v = vec![];
|
||||
for i in range(0, sz) {
|
||||
for i in 0..sz {
|
||||
check_links(&m);
|
||||
let r: u8 = rand::random();
|
||||
match r % 6 {
|
||||
|
@ -1719,21 +1719,21 @@ mod tests {
|
||||
#[test]
|
||||
fn test_push_front_grow() {
|
||||
let mut deq = RingBuf::new();
|
||||
for i in range(0u, 66) {
|
||||
for i in 0u..66 {
|
||||
deq.push_front(i);
|
||||
}
|
||||
assert_eq!(deq.len(), 66);
|
||||
|
||||
for i in range(0u, 66) {
|
||||
for i in 0u..66 {
|
||||
assert_eq!(deq[i], 65 - i);
|
||||
}
|
||||
|
||||
let mut deq = RingBuf::new();
|
||||
for i in range(0u, 66) {
|
||||
for i in 0u..66 {
|
||||
deq.push_back(i);
|
||||
}
|
||||
|
||||
for i in range(0u, 66) {
|
||||
for i in 0u..66 {
|
||||
assert_eq!(deq[i], i);
|
||||
}
|
||||
}
|
||||
@ -1741,7 +1741,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_index() {
|
||||
let mut deq = RingBuf::new();
|
||||
for i in range(1u, 4) {
|
||||
for i in 1u..4 {
|
||||
deq.push_front(i);
|
||||
}
|
||||
assert_eq!(deq[1], 2);
|
||||
@ -1751,7 +1751,7 @@ mod tests {
|
||||
#[should_fail]
|
||||
fn test_index_out_of_bounds() {
|
||||
let mut deq = RingBuf::new();
|
||||
for i in range(1u, 4) {
|
||||
for i in 1u..4 {
|
||||
deq.push_front(i);
|
||||
}
|
||||
deq[3];
|
||||
@ -1769,7 +1769,7 @@ mod tests {
|
||||
fn bench_push_back_100(b: &mut test::Bencher) {
|
||||
let mut deq = RingBuf::with_capacity(101);
|
||||
b.iter(|| {
|
||||
for i in range(0i, 100) {
|
||||
for i in 0i..100 {
|
||||
deq.push_back(i);
|
||||
}
|
||||
deq.head = 0;
|
||||
@ -1781,7 +1781,7 @@ mod tests {
|
||||
fn bench_push_front_100(b: &mut test::Bencher) {
|
||||
let mut deq = RingBuf::with_capacity(101);
|
||||
b.iter(|| {
|
||||
for i in range(0i, 100) {
|
||||
for i in 0i..100 {
|
||||
deq.push_front(i);
|
||||
}
|
||||
deq.head = 0;
|
||||
@ -1819,7 +1819,7 @@ mod tests {
|
||||
fn bench_grow_1025(b: &mut test::Bencher) {
|
||||
b.iter(|| {
|
||||
let mut deq = RingBuf::new();
|
||||
for i in range(0i, 1025) {
|
||||
for i in 0i..1025 {
|
||||
deq.push_front(i);
|
||||
}
|
||||
test::black_box(deq);
|
||||
@ -1989,7 +1989,7 @@ mod tests {
|
||||
assert_eq!(d.iter().next(), None);
|
||||
assert_eq!(d.iter().size_hint(), (0, Some(0)));
|
||||
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
{
|
||||
@ -1997,7 +1997,7 @@ mod tests {
|
||||
assert_eq!(d.iter().collect::<Vec<&int>>(), b);
|
||||
}
|
||||
|
||||
for i in range(6i, 9) {
|
||||
for i in 6i..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
{
|
||||
@ -2020,7 +2020,7 @@ mod tests {
|
||||
let mut d = RingBuf::new();
|
||||
assert_eq!(d.iter().rev().next(), None);
|
||||
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
{
|
||||
@ -2028,7 +2028,7 @@ mod tests {
|
||||
assert_eq!(d.iter().rev().collect::<Vec<&int>>(), b);
|
||||
}
|
||||
|
||||
for i in range(6i, 9) {
|
||||
for i in 6i..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
let b: &[_] = &[&4,&3,&2,&1,&0,&6,&7,&8];
|
||||
@ -2055,7 +2055,7 @@ mod tests {
|
||||
let mut d = RingBuf::new();
|
||||
assert!(d.iter_mut().next().is_none());
|
||||
|
||||
for i in range(0u, 3) {
|
||||
for i in 0u..3 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2078,7 +2078,7 @@ mod tests {
|
||||
let mut d = RingBuf::new();
|
||||
assert!(d.iter_mut().rev().next().is_none());
|
||||
|
||||
for i in range(0u, 3) {
|
||||
for i in 0u..3 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2112,7 +2112,7 @@ mod tests {
|
||||
// simple iter
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
|
||||
@ -2123,10 +2123,10 @@ mod tests {
|
||||
// wrapped iter
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
for i in range(6, 9) {
|
||||
for i in 6..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2137,10 +2137,10 @@ mod tests {
|
||||
// partially used
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
for i in range(6, 9) {
|
||||
for i in 6..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2176,7 +2176,7 @@ mod tests {
|
||||
// simple iter
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
|
||||
@ -2187,10 +2187,10 @@ mod tests {
|
||||
// wrapped iter
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
for i in range(6, 9) {
|
||||
for i in 6..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2201,10 +2201,10 @@ mod tests {
|
||||
// partially used
|
||||
{
|
||||
let mut d = RingBuf::new();
|
||||
for i in range(0i, 5) {
|
||||
for i in 0i..5 {
|
||||
d.push_back(i);
|
||||
}
|
||||
for i in range(6, 9) {
|
||||
for i in 6..9 {
|
||||
d.push_front(i);
|
||||
}
|
||||
|
||||
@ -2389,41 +2389,41 @@ mod tests {
|
||||
// test growth path A
|
||||
// [T o o H] -> [T o o H . . . . ]
|
||||
let mut ring = RingBuf::with_capacity(4);
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
ring.push_back(i);
|
||||
}
|
||||
ring.reserve(7);
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
assert_eq!(ring.pop_front(), Some(i));
|
||||
}
|
||||
|
||||
// test growth path B
|
||||
// [H T o o] -> [. T o o H . . . ]
|
||||
let mut ring = RingBuf::with_capacity(4);
|
||||
for i in range(0i, 1) {
|
||||
for i in 0i..1 {
|
||||
ring.push_back(i);
|
||||
assert_eq!(ring.pop_front(), Some(i));
|
||||
}
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
ring.push_back(i);
|
||||
}
|
||||
ring.reserve(7);
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
assert_eq!(ring.pop_front(), Some(i));
|
||||
}
|
||||
|
||||
// test growth path C
|
||||
// [o o H T] -> [o o H . . . . T ]
|
||||
let mut ring = RingBuf::with_capacity(4);
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
ring.push_back(i);
|
||||
assert_eq!(ring.pop_front(), Some(i));
|
||||
}
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
ring.push_back(i);
|
||||
}
|
||||
ring.reserve(7);
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
assert_eq!(ring.pop_front(), Some(i));
|
||||
}
|
||||
}
|
||||
@ -2463,7 +2463,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_get_mut() {
|
||||
let mut ring = RingBuf::new();
|
||||
for i in range(0i, 3) {
|
||||
for i in 0i..3 {
|
||||
ring.push_back(i);
|
||||
}
|
||||
|
||||
@ -2492,27 +2492,27 @@ mod tests {
|
||||
let usable_cap = tester.capacity();
|
||||
let final_len = usable_cap / 2;
|
||||
|
||||
for len in range(0, final_len) {
|
||||
for len in 0..final_len {
|
||||
let expected = if back {
|
||||
(0..len).collect()
|
||||
} else {
|
||||
(0..len).rev().collect()
|
||||
};
|
||||
for tail_pos in range(0, usable_cap) {
|
||||
for tail_pos in 0..usable_cap {
|
||||
tester.tail = tail_pos;
|
||||
tester.head = tail_pos;
|
||||
if back {
|
||||
for i in range(0, len * 2) {
|
||||
for i in 0..len * 2 {
|
||||
tester.push_front(i);
|
||||
}
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
assert_eq!(tester.swap_back_remove(i), Some(len * 2 - 1 - i));
|
||||
}
|
||||
} else {
|
||||
for i in range(0, len * 2) {
|
||||
for i in 0..len * 2 {
|
||||
tester.push_back(i);
|
||||
}
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
let idx = tester.len() - 1 - i;
|
||||
assert_eq!(tester.swap_front_remove(idx), Some(len * 2 - 1 - i));
|
||||
}
|
||||
@ -2540,14 +2540,14 @@ mod tests {
|
||||
|
||||
|
||||
// len is the length *after* insertion
|
||||
for len in range(1, cap) {
|
||||
for len in 1..cap {
|
||||
// 0, 1, 2, .., len - 1
|
||||
let expected = iter::count(0, 1).take(len).collect();
|
||||
for tail_pos in range(0, cap) {
|
||||
for to_insert in range(0, len) {
|
||||
for tail_pos in 0..cap {
|
||||
for to_insert in 0..len {
|
||||
tester.tail = tail_pos;
|
||||
tester.head = tail_pos;
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
if i != to_insert {
|
||||
tester.push_back(i);
|
||||
}
|
||||
@ -2573,14 +2573,14 @@ mod tests {
|
||||
let cap = tester.capacity();
|
||||
|
||||
// len is the length *after* removal
|
||||
for len in range(0, cap - 1) {
|
||||
for len in 0..cap - 1 {
|
||||
// 0, 1, 2, .., len - 1
|
||||
let expected = iter::count(0, 1).take(len).collect();
|
||||
for tail_pos in range(0, cap) {
|
||||
for to_remove in range(0, len + 1) {
|
||||
for tail_pos in 0..cap {
|
||||
for to_remove in 0..len + 1 {
|
||||
tester.tail = tail_pos;
|
||||
tester.head = tail_pos;
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
if i == to_remove {
|
||||
tester.push_back(1234);
|
||||
}
|
||||
@ -2611,14 +2611,14 @@ mod tests {
|
||||
tester.reserve(63);
|
||||
let max_cap = tester.capacity();
|
||||
|
||||
for len in range(0, cap + 1) {
|
||||
for len in 0..cap + 1 {
|
||||
// 0, 1, 2, .., len - 1
|
||||
let expected = iter::count(0, 1).take(len).collect();
|
||||
for tail_pos in range(0, max_cap + 1) {
|
||||
for tail_pos in 0..max_cap + 1 {
|
||||
tester.tail = tail_pos;
|
||||
tester.head = tail_pos;
|
||||
tester.reserve(63);
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
tester.push_back(i);
|
||||
}
|
||||
tester.shrink_to_fit();
|
||||
@ -2648,7 +2648,7 @@ mod tests {
|
||||
let cap = ring.capacity() as int;
|
||||
let first = cap/2;
|
||||
let last = cap - first;
|
||||
for i in range(0, first) {
|
||||
for i in 0..first {
|
||||
ring.push_back(i);
|
||||
|
||||
let (left, right) = ring.as_slices();
|
||||
@ -2657,7 +2657,7 @@ mod tests {
|
||||
assert_eq!(right, []);
|
||||
}
|
||||
|
||||
for j in range(-last, 0) {
|
||||
for j in -last..0 {
|
||||
ring.push_front(j);
|
||||
let (left, right) = ring.as_slices();
|
||||
let expected_left: Vec<_> = (-last..j+1).rev().collect();
|
||||
@ -2676,7 +2676,7 @@ mod tests {
|
||||
let cap = ring.capacity() as int;
|
||||
let first = cap/2;
|
||||
let last = cap - first;
|
||||
for i in range(0, first) {
|
||||
for i in 0..first {
|
||||
ring.push_back(i);
|
||||
|
||||
let (left, right) = ring.as_mut_slices();
|
||||
@ -2685,7 +2685,7 @@ mod tests {
|
||||
assert_eq!(right, []);
|
||||
}
|
||||
|
||||
for j in range(-last, 0) {
|
||||
for j in -last..0 {
|
||||
ring.push_front(j);
|
||||
let (left, right) = ring.as_mut_slices();
|
||||
let expected_left: Vec<_> = (-last..j+1).rev().collect();
|
||||
|
@ -1305,7 +1305,7 @@ fn insertion_sort<T, F>(v: &mut [T], mut compare: F) where F: FnMut(&T, &T) -> O
|
||||
let buf_v = v.as_mut_ptr();
|
||||
|
||||
// 1 <= i < len;
|
||||
for i in range(1, len) {
|
||||
for i in 1..len {
|
||||
// j satisfies: 0 <= j <= i;
|
||||
let mut j = i;
|
||||
unsafe {
|
||||
@ -2097,8 +2097,8 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_sort() {
|
||||
for len in range(4u, 25) {
|
||||
for _ in range(0i, 100) {
|
||||
for len in 4u..25 {
|
||||
for _ in 0i..100 {
|
||||
let mut v = thread_rng().gen_iter::<uint>().take(len)
|
||||
.collect::<Vec<uint>>();
|
||||
let mut v1 = v.clone();
|
||||
@ -2125,8 +2125,8 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_sort_stability() {
|
||||
for len in range(4i, 25) {
|
||||
for _ in range(0u, 10) {
|
||||
for len in 4i..25 {
|
||||
for _ in 0u..10 {
|
||||
let mut counts = [0i; 10];
|
||||
|
||||
// create a vector like [(6, 1), (5, 1), (6, 2), ...],
|
||||
@ -2717,7 +2717,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_shrink_to_fit() {
|
||||
let mut xs = vec![0, 1, 2, 3];
|
||||
for i in range(4i, 100) {
|
||||
for i in 4i..100 {
|
||||
xs.push(i)
|
||||
}
|
||||
assert_eq!(xs.capacity(), 128);
|
||||
@ -2993,7 +2993,7 @@ mod bench {
|
||||
unsafe {
|
||||
v.set_len(1024);
|
||||
}
|
||||
for i in range(0u, 1024) {
|
||||
for i in 0u..1024 {
|
||||
v[i] = 0;
|
||||
}
|
||||
});
|
||||
@ -3018,7 +3018,7 @@ mod bench {
|
||||
let mut rng = weak_rng();
|
||||
b.iter(|| {
|
||||
let mut v = repeat((0u, 0u)).take(30).collect::<Vec<_>>();
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
let l = v.len();
|
||||
v.insert(rng.gen::<uint>() % (l + 1),
|
||||
(1, 1));
|
||||
@ -3030,7 +3030,7 @@ mod bench {
|
||||
let mut rng = weak_rng();
|
||||
b.iter(|| {
|
||||
let mut v = repeat((0u, 0u)).take(130).collect::<Vec<_>>();
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
let l = v.len();
|
||||
v.remove(rng.gen::<uint>() % l);
|
||||
}
|
||||
|
@ -142,9 +142,9 @@ Section: Iterators
|
||||
// Helper functions used for Unicode normalization
|
||||
fn canonical_sort(comb: &mut [(char, u8)]) {
|
||||
let len = comb.len();
|
||||
for i in range(0, len) {
|
||||
for i in 0..len {
|
||||
let mut swapped = false;
|
||||
for j in range(1, len-i) {
|
||||
for j in 1..len-i {
|
||||
let class_a = comb[j-1].1;
|
||||
let class_b = comb[j].1;
|
||||
if class_a != 0 && class_b != 0 && class_a > class_b {
|
||||
|
@ -1354,7 +1354,7 @@ mod tests {
|
||||
b.bytes = REPETITIONS;
|
||||
b.iter(|| {
|
||||
let mut r = String::new();
|
||||
for _ in range(0, REPETITIONS) {
|
||||
for _ in 0..REPETITIONS {
|
||||
r.push_str("a")
|
||||
}
|
||||
});
|
||||
@ -1365,7 +1365,7 @@ mod tests {
|
||||
b.bytes = REPETITIONS;
|
||||
b.iter(|| {
|
||||
let mut r = String::new();
|
||||
for _ in range(0, REPETITIONS) {
|
||||
for _ in 0..REPETITIONS {
|
||||
r.push('a')
|
||||
}
|
||||
});
|
||||
@ -1376,7 +1376,7 @@ mod tests {
|
||||
b.bytes = REPETITIONS * 2;
|
||||
b.iter(|| {
|
||||
let mut r = String::new();
|
||||
for _ in range(0, REPETITIONS) {
|
||||
for _ in 0..REPETITIONS {
|
||||
r.push('â')
|
||||
}
|
||||
});
|
||||
|
@ -186,7 +186,7 @@ impl<T> Vec<T> {
|
||||
/// assert_eq!(vec.len(), 0);
|
||||
///
|
||||
/// // These are all done without reallocating...
|
||||
/// for i in range(0i, 10) {
|
||||
/// for i in 0i..10 {
|
||||
/// vec.push(i);
|
||||
/// }
|
||||
///
|
||||
@ -233,7 +233,7 @@ impl<T> Vec<T> {
|
||||
/// mem::forget(v);
|
||||
///
|
||||
/// // Overwrite memory with 4, 5, 6
|
||||
/// for i in range(0, len as int) {
|
||||
/// for i in 0..len as int {
|
||||
/// ptr::write(p.offset(i), 4 + i);
|
||||
/// }
|
||||
///
|
||||
@ -605,7 +605,7 @@ impl<T> Vec<T> {
|
||||
{
|
||||
let v = self.as_mut_slice();
|
||||
|
||||
for i in range(0u, len) {
|
||||
for i in 0u..len {
|
||||
if !f(&v[i]) {
|
||||
del += 1;
|
||||
} else if del > 0 {
|
||||
@ -1969,7 +1969,7 @@ mod tests {
|
||||
v.reserve(2);
|
||||
assert!(v.capacity() >= 2);
|
||||
|
||||
for i in range(0i, 16) {
|
||||
for i in 0i..16 {
|
||||
v.push(i);
|
||||
}
|
||||
|
||||
@ -1989,12 +1989,12 @@ mod tests {
|
||||
let mut w = Vec::new();
|
||||
|
||||
v.extend(range(0i, 3));
|
||||
for i in range(0i, 3) { w.push(i) }
|
||||
for i in 0i..3 { w.push(i) }
|
||||
|
||||
assert_eq!(v, w);
|
||||
|
||||
v.extend(range(3i, 10));
|
||||
for i in range(3i, 10) { w.push(i) }
|
||||
for i in 3i..10 { w.push(i) }
|
||||
|
||||
assert_eq!(v, w);
|
||||
}
|
||||
@ -2750,7 +2750,7 @@ mod tests {
|
||||
b.iter(|| {
|
||||
let mut dst = dst.clone();
|
||||
|
||||
for _ in range(0, times) {
|
||||
for _ in 0..times {
|
||||
dst.clone_from(&src);
|
||||
|
||||
assert_eq!(dst.len(), src_len);
|
||||
|
@ -596,13 +596,13 @@ impl<'a> Formatter<'a> {
|
||||
let len = self.fill.encode_utf8(&mut fill).unwrap_or(0);
|
||||
let fill = unsafe { str::from_utf8_unchecked(&fill[..len]) };
|
||||
|
||||
for _ in range(0, pre_pad) {
|
||||
for _ in 0..pre_pad {
|
||||
try!(self.buf.write_str(fill));
|
||||
}
|
||||
|
||||
try!(f(self));
|
||||
|
||||
for _ in range(0, post_pad) {
|
||||
for _ in 0..post_pad {
|
||||
try!(self.buf.write_str(fill));
|
||||
}
|
||||
|
||||
|
@ -1509,9 +1509,9 @@ impl<T, U, A, B> DoubleEndedIterator for Zip<A, B> where
|
||||
if a_sz != b_sz {
|
||||
// Adjust a, b to equal length
|
||||
if a_sz > b_sz {
|
||||
for _ in range(0, a_sz - b_sz) { self.a.next_back(); }
|
||||
for _ in 0..a_sz - b_sz { self.a.next_back(); }
|
||||
} else {
|
||||
for _ in range(0, b_sz - a_sz) { self.b.next_back(); }
|
||||
for _ in 0..b_sz - a_sz { self.b.next_back(); }
|
||||
}
|
||||
}
|
||||
match (self.a.next_back(), self.b.next_back()) {
|
||||
@ -2539,7 +2539,7 @@ pub struct Range<A> {
|
||||
/// ```
|
||||
/// let array = [0, 1, 2, 3, 4];
|
||||
///
|
||||
/// for i in range(0, 5) {
|
||||
/// for i in 0..5 {
|
||||
/// println!("{}", i);
|
||||
/// assert_eq!(i, array[i]);
|
||||
/// }
|
||||
|
@ -482,7 +482,7 @@ impl<T> SliceExt for [T] {
|
||||
let min = cmp::min(self.len(), src.len());
|
||||
let dst = &mut self[.. min];
|
||||
let src = &src[.. min];
|
||||
for i in range(0, min) {
|
||||
for i in 0..min {
|
||||
dst[i].clone_from(&src[i]);
|
||||
}
|
||||
min
|
||||
|
@ -903,7 +903,7 @@ fn bench_multiple_take(b: &mut Bencher) {
|
||||
let mut it = (0u..42).cycle();
|
||||
b.iter(|| {
|
||||
let n = it.next().unwrap();
|
||||
for _ in range(0u, n) {
|
||||
for _ in 0u..n {
|
||||
it.take(it.next().unwrap()).all(|_| true);
|
||||
}
|
||||
});
|
||||
|
@ -138,14 +138,14 @@ mod tests {
|
||||
fn test_flate_round_trip() {
|
||||
let mut r = rand::thread_rng();
|
||||
let mut words = vec!();
|
||||
for _ in range(0u, 20) {
|
||||
for _ in 0u..20 {
|
||||
let range = r.gen_range(1u, 10);
|
||||
let v = r.gen_iter::<u8>().take(range).collect::<Vec<u8>>();
|
||||
words.push(v);
|
||||
}
|
||||
for _ in range(0u, 20) {
|
||||
for _ in 0u..20 {
|
||||
let mut input = vec![];
|
||||
for _ in range(0u, 2000) {
|
||||
for _ in 0u..2000 {
|
||||
input.push_all(r.choose(words.as_slice()).unwrap().as_slice());
|
||||
}
|
||||
debug!("de/inflate of {} bytes of random word-sequences",
|
||||
|
@ -693,7 +693,7 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
|
||||
}
|
||||
i += 1;
|
||||
}
|
||||
for i in range(0u, n_opts) {
|
||||
for i in 0u..n_opts {
|
||||
let n = vals[i].len();
|
||||
let occ = opts[i].occur;
|
||||
if occ == Req && n == 0 {
|
||||
@ -761,7 +761,7 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String {
|
||||
// here we just need to indent the start of the description
|
||||
let rowlen = row.chars().count();
|
||||
if rowlen < 24 {
|
||||
for _ in range(0, 24 - rowlen) {
|
||||
for _ in 0..24 - rowlen {
|
||||
row.push(' ');
|
||||
}
|
||||
} else {
|
||||
|
@ -69,11 +69,11 @@ macro_rules! double_round{
|
||||
fn core(output: &mut [u32; STATE_WORDS], input: &[u32; STATE_WORDS]) {
|
||||
*output = *input;
|
||||
|
||||
for _ in range(0, CHACHA_ROUNDS / 2) {
|
||||
for _ in 0..CHACHA_ROUNDS / 2 {
|
||||
double_round!(output);
|
||||
}
|
||||
|
||||
for i in range(0, STATE_WORDS) {
|
||||
for i in 0..STATE_WORDS {
|
||||
output[i] += input[i];
|
||||
}
|
||||
}
|
||||
@ -128,7 +128,7 @@ impl ChaChaRng {
|
||||
self.state[2] = 0x79622D32;
|
||||
self.state[3] = 0x6B206574;
|
||||
|
||||
for i in range(0, KEY_WORDS) {
|
||||
for i in 0..KEY_WORDS {
|
||||
self.state[4+i] = key[i];
|
||||
}
|
||||
|
||||
@ -268,9 +268,9 @@ mod test {
|
||||
// Store the 17*i-th 32-bit word,
|
||||
// i.e., the i-th word of the i-th 16-word block
|
||||
let mut v : Vec<u32> = Vec::new();
|
||||
for _ in range(0u, 16) {
|
||||
for _ in 0u..16 {
|
||||
v.push(ra.next_u32());
|
||||
for _ in range(0u, 16) {
|
||||
for _ in 0u..16 {
|
||||
ra.next_u32();
|
||||
}
|
||||
}
|
||||
@ -287,7 +287,7 @@ mod test {
|
||||
let seed : &[_] = &[0u32; 8];
|
||||
let mut rng: ChaChaRng = SeedableRng::from_seed(seed);
|
||||
let mut clone = rng.clone();
|
||||
for _ in range(0u, 16) {
|
||||
for _ in 0u..16 {
|
||||
assert_eq!(rng.next_u64(), clone.next_u64());
|
||||
}
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ mod test {
|
||||
fn test_exp() {
|
||||
let mut exp = Exp::new(10.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
assert!(exp.sample(&mut rng) >= 0.0);
|
||||
assert!(exp.ind_sample(&mut rng) >= 0.0);
|
||||
}
|
||||
@ -137,7 +137,7 @@ mod bench {
|
||||
let mut exp = Exp::new(2.71828 * 3.14159);
|
||||
|
||||
b.iter(|| {
|
||||
for _ in range(0, ::RAND_BENCH_N) {
|
||||
for _ in 0..::RAND_BENCH_N {
|
||||
exp.sample(&mut rng);
|
||||
}
|
||||
});
|
||||
|
@ -332,7 +332,7 @@ mod test {
|
||||
fn test_chi_squared_one() {
|
||||
let mut chi = ChiSquared::new(1.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
chi.sample(&mut rng);
|
||||
chi.ind_sample(&mut rng);
|
||||
}
|
||||
@ -341,7 +341,7 @@ mod test {
|
||||
fn test_chi_squared_small() {
|
||||
let mut chi = ChiSquared::new(0.5);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
chi.sample(&mut rng);
|
||||
chi.ind_sample(&mut rng);
|
||||
}
|
||||
@ -350,7 +350,7 @@ mod test {
|
||||
fn test_chi_squared_large() {
|
||||
let mut chi = ChiSquared::new(30.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
chi.sample(&mut rng);
|
||||
chi.ind_sample(&mut rng);
|
||||
}
|
||||
@ -365,7 +365,7 @@ mod test {
|
||||
fn test_f() {
|
||||
let mut f = FisherF::new(2.0, 32.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
f.sample(&mut rng);
|
||||
f.ind_sample(&mut rng);
|
||||
}
|
||||
@ -375,7 +375,7 @@ mod test {
|
||||
fn test_t() {
|
||||
let mut t = StudentT::new(11.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
t.sample(&mut rng);
|
||||
t.ind_sample(&mut rng);
|
||||
}
|
||||
@ -398,7 +398,7 @@ mod bench {
|
||||
let mut rng = ::test::weak_rng();
|
||||
|
||||
b.iter(|| {
|
||||
for _ in range(0, ::RAND_BENCH_N) {
|
||||
for _ in 0..::RAND_BENCH_N {
|
||||
gamma.ind_sample(&mut rng);
|
||||
}
|
||||
});
|
||||
@ -411,7 +411,7 @@ mod bench {
|
||||
let mut rng = ::test::weak_rng();
|
||||
|
||||
b.iter(|| {
|
||||
for _ in range(0, ::RAND_BENCH_N) {
|
||||
for _ in 0..::RAND_BENCH_N {
|
||||
gamma.ind_sample(&mut rng);
|
||||
}
|
||||
});
|
||||
|
@ -97,7 +97,7 @@ pub struct Weighted<T> {
|
||||
/// Weighted { weight: 1, item: 'c' });
|
||||
/// let wc = WeightedChoice::new(items.as_mut_slice());
|
||||
/// let mut rng = rand::thread_rng();
|
||||
/// for _ in range(0u, 16) {
|
||||
/// for _ in 0u..16 {
|
||||
/// // on average prints 'a' 4 times, 'b' 8 and 'c' twice.
|
||||
/// println!("{}", wc.ind_sample(&mut rng));
|
||||
/// }
|
||||
|
@ -169,7 +169,7 @@ mod tests {
|
||||
fn test_normal() {
|
||||
let mut norm = Normal::new(10.0, 10.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
norm.sample(&mut rng);
|
||||
norm.ind_sample(&mut rng);
|
||||
}
|
||||
@ -185,7 +185,7 @@ mod tests {
|
||||
fn test_log_normal() {
|
||||
let mut lnorm = LogNormal::new(10.0, 10.0);
|
||||
let mut rng = ::test::rng();
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
lnorm.sample(&mut rng);
|
||||
lnorm.ind_sample(&mut rng);
|
||||
}
|
||||
@ -212,7 +212,7 @@ mod bench {
|
||||
let mut normal = Normal::new(-2.71828, 3.14159);
|
||||
|
||||
b.iter(|| {
|
||||
for _ in range(0, ::RAND_BENCH_N) {
|
||||
for _ in 0..::RAND_BENCH_N {
|
||||
normal.sample(&mut rng);
|
||||
}
|
||||
});
|
||||
|
@ -41,7 +41,7 @@ use distributions::{Sample, IndependentSample};
|
||||
/// let between = Range::new(10u, 10000u);
|
||||
/// let mut rng = std::rand::thread_rng();
|
||||
/// let mut sum = 0;
|
||||
/// for _ in range(0u, 1000) {
|
||||
/// for _ in 0u..1000 {
|
||||
/// sum += between.ind_sample(&mut rng);
|
||||
/// }
|
||||
/// println!("{}", sum);
|
||||
@ -190,7 +190,7 @@ mod tests {
|
||||
(Int::min_value(), Int::max_value())];
|
||||
for &(low, high) in v.iter() {
|
||||
let mut sampler: Range<$ty> = Range::new(low, high);
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
let v = sampler.sample(&mut rng);
|
||||
assert!(low <= v && v < high);
|
||||
let v = sampler.ind_sample(&mut rng);
|
||||
@ -216,7 +216,7 @@ mod tests {
|
||||
(-1e35, 1e35)];
|
||||
for &(low, high) in v.iter() {
|
||||
let mut sampler: Range<$ty> = Range::new(low, high);
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
let v = sampler.sample(&mut rng);
|
||||
assert!(low <= v && v < high);
|
||||
let v = sampler.ind_sample(&mut rng);
|
||||
|
@ -82,7 +82,7 @@ impl IsaacRng {
|
||||
}}
|
||||
}
|
||||
|
||||
for _ in range(0u, 4) {
|
||||
for _ in 0u..4 {
|
||||
mix!();
|
||||
}
|
||||
|
||||
@ -323,7 +323,7 @@ impl Isaac64Rng {
|
||||
}}
|
||||
}
|
||||
|
||||
for _ in range(0u, 4) {
|
||||
for _ in 0u..4 {
|
||||
mix!();
|
||||
}
|
||||
|
||||
@ -581,7 +581,7 @@ mod test {
|
||||
let seed: &[_] = &[12345, 67890, 54321, 9876];
|
||||
let mut rb: IsaacRng = SeedableRng::from_seed(seed);
|
||||
// skip forward to the 10000th number
|
||||
for _ in range(0u, 10000) { rb.next_u32(); }
|
||||
for _ in 0u..10000 { rb.next_u32(); }
|
||||
|
||||
let v = (0..10).map(|_| rb.next_u32()).collect::<Vec<_>>();
|
||||
assert_eq!(v,
|
||||
@ -603,7 +603,7 @@ mod test {
|
||||
let seed: &[_] = &[12345, 67890, 54321, 9876];
|
||||
let mut rb: Isaac64Rng = SeedableRng::from_seed(seed);
|
||||
// skip forward to the 10000th number
|
||||
for _ in range(0u, 10000) { rb.next_u64(); }
|
||||
for _ in 0u..10000 { rb.next_u64(); }
|
||||
|
||||
let v = (0..10).map(|_| rb.next_u64()).collect::<Vec<_>>();
|
||||
assert_eq!(v,
|
||||
@ -618,7 +618,7 @@ mod test {
|
||||
let seed: &[_] = &[1, 23, 456, 7890, 12345];
|
||||
let mut rng: Isaac64Rng = SeedableRng::from_seed(seed);
|
||||
let mut clone = rng.clone();
|
||||
for _ in range(0u, 16) {
|
||||
for _ in 0u..16 {
|
||||
assert_eq!(rng.next_u64(), clone.next_u64());
|
||||
}
|
||||
}
|
||||
|
@ -241,7 +241,7 @@ mod tests {
|
||||
// this is unlikely to catch an incorrect implementation that
|
||||
// generates exactly 0 or 1, but it keeps it sane.
|
||||
let mut rng = thread_rng();
|
||||
for _ in range(0u, 1_000) {
|
||||
for _ in 0u..1_000 {
|
||||
// strict inequalities
|
||||
let Open01(f) = rng.gen::<Open01<f64>>();
|
||||
assert!(0.0 < f && f < 1.0);
|
||||
@ -254,7 +254,7 @@ mod tests {
|
||||
#[test]
|
||||
fn rand_closed() {
|
||||
let mut rng = thread_rng();
|
||||
for _ in range(0u, 1_000) {
|
||||
for _ in 0u..1_000 {
|
||||
// strict inequalities
|
||||
let Closed01(f) = rng.gen::<Closed01<f64>>();
|
||||
assert!(0.0 <= f && f <= 1.0);
|
||||
|
@ -187,7 +187,7 @@ mod test {
|
||||
let mut rs = ReseedingRng::new(Counter {i:0}, 400, ReseedWithDefault);
|
||||
|
||||
let mut i = 0;
|
||||
for _ in range(0u, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
assert_eq!(rs.next_u32(), i % 100);
|
||||
i += 1;
|
||||
}
|
||||
|
@ -189,7 +189,7 @@ mod tests {
|
||||
b.bytes = (times * len) as u64;
|
||||
b.iter(|| {
|
||||
let mut wr = SeekableMemWriter::new();
|
||||
for _ in range(0, times) {
|
||||
for _ in 0..times {
|
||||
wr.write(src.as_slice()).unwrap();
|
||||
}
|
||||
|
||||
|
@ -540,7 +540,7 @@ impl<'a, 'tcx> Context<'a, 'tcx> {
|
||||
run_lints!(self, exit_lint_attrs, attrs);
|
||||
|
||||
// rollback
|
||||
for _ in range(0, pushed) {
|
||||
for _ in 0..pushed {
|
||||
let (lint, lvlsrc) = self.level_stack.pop().unwrap();
|
||||
self.lints.set_level(lint, lvlsrc);
|
||||
}
|
||||
|
@ -1293,7 +1293,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
|
||||
}
|
||||
ty::AdjustDerefRef(ref adj) => {
|
||||
assert!(!ty::adjust_is_object(adjustment));
|
||||
for autoderef in range(0, adj.autoderefs) {
|
||||
for autoderef in 0..adj.autoderefs {
|
||||
let method_call = MethodCall::autoderef(id, autoderef);
|
||||
for &method in tcx.method_map.borrow().get(&method_call).iter() {
|
||||
rbml_w.tag(c::tag_table_method_map, |rbml_w| {
|
||||
@ -1529,7 +1529,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
|
||||
|
||||
fn type_string(doc: rbml::Doc) -> String {
|
||||
let mut str = String::new();
|
||||
for i in range(doc.start, doc.end) {
|
||||
for i in doc.start..doc.end {
|
||||
str.push(doc.data[i] as char);
|
||||
}
|
||||
str
|
||||
|
@ -352,7 +352,7 @@ impl<'a, 'tcx, O:DataFlowOperator> DataFlowContext<'a, 'tcx, O> {
|
||||
for (word_index, &word) in words.iter().enumerate() {
|
||||
if word != 0 {
|
||||
let base_index = word_index * uint::BITS;
|
||||
for offset in range(0u, uint::BITS) {
|
||||
for offset in 0u..uint::BITS {
|
||||
let bit = 1 << offset;
|
||||
if (word & bit) != 0 {
|
||||
// NB: we round up the total number of bits
|
||||
@ -552,7 +552,7 @@ fn bits_to_string(words: &[uint]) -> String {
|
||||
|
||||
for &word in words.iter() {
|
||||
let mut v = word;
|
||||
for _ in range(0u, uint::BYTES) {
|
||||
for _ in 0u..uint::BYTES {
|
||||
result.push(sep);
|
||||
result.push_str(&format!("{:02x}", v & 0xFF)[]);
|
||||
v >>= 8;
|
||||
|
@ -842,7 +842,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
|
||||
autoderefs: uint) {
|
||||
debug!("walk_autoderefs expr={} autoderefs={}", expr.repr(self.tcx()), autoderefs);
|
||||
|
||||
for i in range(0, autoderefs) {
|
||||
for i in 0..autoderefs {
|
||||
let deref_id = ty::MethodCall::autoderef(expr.id, i);
|
||||
match self.typer.node_method_ty(deref_id) {
|
||||
None => {}
|
||||
|
@ -176,7 +176,7 @@ pub trait Combine<'tcx> : Sized {
|
||||
assert_eq!(num_region_params, a_rs.len());
|
||||
assert_eq!(num_region_params, b_rs.len());
|
||||
let mut rs = vec!();
|
||||
for i in range(0, num_region_params) {
|
||||
for i in 0..num_region_params {
|
||||
let a_r = a_rs[i];
|
||||
let b_r = b_rs[i];
|
||||
let variance = variances[i];
|
||||
|
@ -1347,7 +1347,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
|
||||
indexes.contains(&i)
|
||||
});
|
||||
if need_insert {
|
||||
for i in range(0, expected) {
|
||||
for i in 0..expected {
|
||||
if indexes.contains(&i) {
|
||||
new_lts.push(lifetime);
|
||||
} else {
|
||||
@ -1767,7 +1767,7 @@ impl LifeGiver {
|
||||
let mut s = String::new();
|
||||
let (n, r) = (counter/26 + 1, counter % 26);
|
||||
let letter: char = from_u32((r+97) as u32).unwrap();
|
||||
for _ in range(0, n) {
|
||||
for _ in 0..n {
|
||||
s.push(letter);
|
||||
}
|
||||
s
|
||||
|
@ -1328,7 +1328,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> {
|
||||
let mut graph = graph::Graph::with_capacity(num_vars as uint + 1,
|
||||
num_edges);
|
||||
|
||||
for _ in range(0, num_vars) {
|
||||
for _ in 0..num_vars {
|
||||
graph.add_node(());
|
||||
}
|
||||
let dummy_idx = graph.add_node(());
|
||||
|
@ -687,7 +687,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
|
||||
{
|
||||
let node_base_idx = self.idx(ln, Variable(0u));
|
||||
let succ_base_idx = self.idx(succ_ln, Variable(0u));
|
||||
for var_idx in range(0u, self.ir.num_vars) {
|
||||
for var_idx in 0u..self.ir.num_vars {
|
||||
op(self, node_base_idx + var_idx, succ_base_idx + var_idx);
|
||||
}
|
||||
}
|
||||
@ -700,7 +700,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
|
||||
F: FnMut(uint) -> LiveNode,
|
||||
{
|
||||
let node_base_idx = self.idx(ln, Variable(0));
|
||||
for var_idx in range(0u, self.ir.num_vars) {
|
||||
for var_idx in 0u..self.ir.num_vars {
|
||||
let idx = node_base_idx + var_idx;
|
||||
if test(idx).is_valid() {
|
||||
try!(write!(wr, " {:?}", Variable(var_idx)));
|
||||
@ -860,7 +860,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
|
||||
// hack to skip the loop unless debug! is enabled:
|
||||
debug!("^^ liveness computation results for body {} (entry={:?})",
|
||||
{
|
||||
for ln_idx in range(0u, self.ir.num_live_nodes) {
|
||||
for ln_idx in 0u..self.ir.num_live_nodes {
|
||||
debug!("{:?}", self.ln_str(LiveNode(ln_idx)));
|
||||
}
|
||||
body.id
|
||||
|
@ -456,7 +456,7 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> {
|
||||
debug!("cat_expr_autoderefd: autoderefs={}, cmt={}",
|
||||
autoderefs,
|
||||
cmt.repr(self.tcx()));
|
||||
for deref in range(1u, autoderefs + 1) {
|
||||
for deref in 1u..autoderefs + 1 {
|
||||
cmt = try!(self.cat_deref(expr, cmt, deref));
|
||||
}
|
||||
return Ok(cmt);
|
||||
|
@ -4344,7 +4344,7 @@ pub fn adjust_ty<'tcx, F>(cx: &ctxt<'tcx>,
|
||||
let mut adjusted_ty = unadjusted_ty;
|
||||
|
||||
if !ty::type_is_error(adjusted_ty) {
|
||||
for i in range(0, adj.autoderefs) {
|
||||
for i in 0..adj.autoderefs {
|
||||
let method_call = MethodCall::autoderef(expr_id, i);
|
||||
match method_type(method_call) {
|
||||
Some(method_ty) => {
|
||||
|
@ -45,7 +45,7 @@ pub fn lev_distance(me: &str, t: &str) -> uint {
|
||||
fn test_lev_distance() {
|
||||
use std::char::{ from_u32, MAX };
|
||||
// Test bytelength agnosticity
|
||||
for c in range(0u32, MAX as u32)
|
||||
for c in 0u32..MAX as u32
|
||||
.filter_map(|i| from_u32(i))
|
||||
.map(|i| i.to_string()) {
|
||||
assert_eq!(lev_distance(&c[], &c[]), 0);
|
||||
|
@ -358,7 +358,7 @@ fn add_fragment_siblings_for_extension<'tcx>(this: &MoveData<'tcx>,
|
||||
parent_ty.repr(tcx)),
|
||||
};
|
||||
let tuple_len = v.len();
|
||||
for i in range(0, tuple_len) {
|
||||
for i in 0..tuple_len {
|
||||
if i == tuple_idx { continue }
|
||||
let field_name = mc::PositionalField(i);
|
||||
add_fragment_sibling_local(field_name, None);
|
||||
|
@ -601,7 +601,7 @@ fn link_rlib<'a>(sess: &'a Session,
|
||||
// For LTO purposes, the bytecode of this library is also inserted
|
||||
// into the archive. If codegen_units > 1, we insert each of the
|
||||
// bitcode files.
|
||||
for i in range(0, sess.opts.cg.codegen_units) {
|
||||
for i in 0..sess.opts.cg.codegen_units {
|
||||
// Note that we make sure that the bytecode filename in the
|
||||
// archive is never exactly 16 bytes long by adding a 16 byte
|
||||
// extension to it. This is to work around a bug in LLDB that
|
||||
|
@ -901,7 +901,7 @@ fn run_work_multithreaded(sess: &Session,
|
||||
let mut diag_emitter = SharedEmitter::new();
|
||||
let mut futures = Vec::with_capacity(num_workers);
|
||||
|
||||
for i in range(0, num_workers) {
|
||||
for i in 0..num_workers {
|
||||
let work_items_arc = work_items_arc.clone();
|
||||
let diag_emitter = diag_emitter.clone();
|
||||
let remark = sess.opts.cg.remark.clone();
|
||||
|
@ -195,7 +195,7 @@ pub fn const_expr<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, e: &ast::Expr)
|
||||
let mut ty = ety;
|
||||
// Save the last autoderef in case we can avoid it.
|
||||
if adj.autoderefs > 0 {
|
||||
for _ in range(0, adj.autoderefs-1) {
|
||||
for _ in 0..adj.autoderefs-1 {
|
||||
let (dv, dt) = const_deref(cx, llconst, ty, false);
|
||||
llconst = dv;
|
||||
ty = dt;
|
||||
|
@ -274,7 +274,7 @@ impl<'tcx> SharedCrateContext<'tcx> {
|
||||
available_drop_glues: RefCell::new(FnvHashMap()),
|
||||
};
|
||||
|
||||
for i in range(0, local_count) {
|
||||
for i in 0..local_count {
|
||||
// Append ".rs" to crate name as LLVM module identifier.
|
||||
//
|
||||
// LLVM code generator emits a ".file filename" directive
|
||||
|
@ -2117,7 +2117,7 @@ fn deref_multiple<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
|
||||
-> DatumBlock<'blk, 'tcx, Expr> {
|
||||
let mut bcx = bcx;
|
||||
let mut datum = datum;
|
||||
for i in range(0, times) {
|
||||
for i in 0..times {
|
||||
let method_call = MethodCall::autoderef(expr.id, i);
|
||||
datum = unpack_datum!(bcx, deref_once(bcx, expr, datum, method_call));
|
||||
}
|
||||
|
@ -948,7 +948,7 @@ fn constrain_autoderefs<'a, 'tcx>(rcx: &mut Rcx<'a, 'tcx>,
|
||||
derefd_ty.repr(rcx.tcx()));
|
||||
|
||||
let r_deref_expr = ty::ReScope(CodeExtent::from_node_id(deref_expr.id));
|
||||
for i in range(0u, derefs) {
|
||||
for i in 0u..derefs {
|
||||
let method_call = MethodCall::autoderef(deref_expr.id, i);
|
||||
debug!("constrain_autoderefs: method_call={:?} (of {:?} total)", method_call, derefs);
|
||||
|
||||
|
@ -263,7 +263,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
|
||||
}
|
||||
|
||||
ty::AdjustDerefRef(adj) => {
|
||||
for autoderef in range(0, adj.autoderefs) {
|
||||
for autoderef in 0..adj.autoderefs {
|
||||
let method_call = MethodCall::autoderef(id, autoderef);
|
||||
self.visit_method_map_entry(reason, method_call);
|
||||
}
|
||||
|
@ -2251,7 +2251,7 @@ impl<'a> fmt::Display for Source<'a> {
|
||||
tmp /= 10;
|
||||
}
|
||||
try!(write!(fmt, "<pre class=\"line-numbers\">"));
|
||||
for i in range(1, lines + 1) {
|
||||
for i in 1..lines + 1 {
|
||||
try!(write!(fmt, "<span id=\"{0}\">{0:1$}</span>\n", i, cols));
|
||||
}
|
||||
try!(write!(fmt, "</pre>"));
|
||||
|
@ -154,7 +154,7 @@ impl TocBuilder {
|
||||
// fill in any missing zeros, e.g. for
|
||||
// # Foo (1)
|
||||
// ### Bar (1.0.1)
|
||||
for _ in range(toc_level, level - 1) {
|
||||
for _ in toc_level..level - 1 {
|
||||
sec_number.push_str("0.");
|
||||
}
|
||||
let number = toc.count_entries_with_level(level);
|
||||
|
@ -36,7 +36,7 @@ impl<T:Decodable> Decodable for DList<T> {
|
||||
fn decode<D: Decoder>(d: &mut D) -> Result<DList<T>, 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<T:Decodable> Decodable for RingBuf<T> {
|
||||
fn decode<D: Decoder>(d: &mut D) -> Result<RingBuf<T>, D::Error> {
|
||||
d.read_seq(|d, len| {
|
||||
let mut deque: RingBuf<T> = 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: Decoder>(d: &mut D) -> Result<BTreeMap<K, V>, 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: Decoder>(d: &mut D) -> Result<BTreeSet<T>, 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: Decoder>(d: &mut D) -> Result<EnumSet<T>, 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<K, V, S> Decodable for HashMap<K, V, S>
|
||||
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<T, S> Decodable for HashSet<T, S>
|
||||
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<V: Decodable> Decodable for VecMap<V> {
|
||||
fn decode<D: Decoder>(d: &mut D) -> Result<VecMap<V>, 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);
|
||||
|
@ -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(),
|
||||
|
@ -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]},"#);
|
||||
}
|
||||
|
@ -461,7 +461,7 @@ impl<T:Decodable> Decodable for Vec<T> {
|
||||
fn decode<D: Decoder>(d: &mut D) -> Result<Vec<T>, 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<D: Decoder> 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)
|
||||
|
@ -89,7 +89,7 @@ impl DefaultResizePolicy {
|
||||
fn test_resize_policy() {
|
||||
use prelude::v1::*;
|
||||
let rp = DefaultResizePolicy;
|
||||
for n in range(0u, 1000) {
|
||||
for n in 0u..1000 {
|
||||
assert!(rp.min_capacity(rp.usable_capacity(n)) <= n);
|
||||
assert!(rp.usable_capacity(rp.min_capacity(n)) <= n);
|
||||
}
|
||||
@ -1681,24 +1681,24 @@ mod test_map {
|
||||
let mut m = HashMap::new();
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 0);
|
||||
}
|
||||
});
|
||||
|
||||
for i in range(0u, 100) {
|
||||
for i in 0u..100 {
|
||||
let d1 = Dropable::new(i);
|
||||
let d2 = Dropable::new(i+100);
|
||||
m.insert(d1, d2);
|
||||
}
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 1);
|
||||
}
|
||||
});
|
||||
|
||||
for i in range(0u, 50) {
|
||||
for i in 0u..50 {
|
||||
let k = Dropable::new(i);
|
||||
let v = m.remove(&k);
|
||||
|
||||
@ -1711,12 +1711,12 @@ mod test_map {
|
||||
}
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 50) {
|
||||
for i in 0u..50 {
|
||||
assert_eq!(v.borrow()[i], 0);
|
||||
assert_eq!(v.borrow()[i+100], 0);
|
||||
}
|
||||
|
||||
for i in range(50u, 100) {
|
||||
for i in 50u..100 {
|
||||
assert_eq!(v.borrow()[i], 1);
|
||||
assert_eq!(v.borrow()[i+100], 1);
|
||||
}
|
||||
@ -1724,7 +1724,7 @@ mod test_map {
|
||||
}
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 0);
|
||||
}
|
||||
});
|
||||
@ -1740,19 +1740,19 @@ mod test_map {
|
||||
let mut hm = HashMap::new();
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 0);
|
||||
}
|
||||
});
|
||||
|
||||
for i in range(0u, 100) {
|
||||
for i in 0u..100 {
|
||||
let d1 = Dropable::new(i);
|
||||
let d2 = Dropable::new(i+100);
|
||||
hm.insert(d1, d2);
|
||||
}
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 1);
|
||||
}
|
||||
});
|
||||
@ -1767,7 +1767,7 @@ mod test_map {
|
||||
let mut half = hm.into_iter().take(50);
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 1);
|
||||
}
|
||||
});
|
||||
@ -1789,7 +1789,7 @@ mod test_map {
|
||||
};
|
||||
|
||||
DROP_VECTOR.with(|v| {
|
||||
for i in range(0u, 200) {
|
||||
for i in 0u..200 {
|
||||
assert_eq!(v.borrow()[i], 0);
|
||||
}
|
||||
});
|
||||
@ -1807,7 +1807,7 @@ mod test_map {
|
||||
|
||||
// Try this a few times to make sure we never screw up the hashmap's
|
||||
// internal state.
|
||||
for _ in range(0i, 10) {
|
||||
for _ in 0i..10 {
|
||||
assert!(m.is_empty());
|
||||
|
||||
for i in range_inclusive(1i, 1000) {
|
||||
@ -1934,7 +1934,7 @@ mod test_map {
|
||||
#[test]
|
||||
fn test_iterate() {
|
||||
let mut m = HashMap::with_capacity(4);
|
||||
for i in range(0u, 32) {
|
||||
for i in 0u..32 {
|
||||
assert!(m.insert(i, i*2).is_none());
|
||||
}
|
||||
assert_eq!(m.len(), 32);
|
||||
@ -2050,7 +2050,7 @@ mod test_map {
|
||||
assert_eq!(cap, initial_cap * 2);
|
||||
|
||||
let mut i = 0u;
|
||||
for _ in range(0, cap * 3 / 4) {
|
||||
for _ in 0..cap * 3 / 4 {
|
||||
m.insert(i, i);
|
||||
i += 1;
|
||||
}
|
||||
@ -2059,7 +2059,7 @@ mod test_map {
|
||||
assert_eq!(m.len(), i);
|
||||
assert_eq!(m.table.capacity(), cap);
|
||||
|
||||
for _ in range(0, cap / 4) {
|
||||
for _ in 0..cap / 4 {
|
||||
m.insert(i, i);
|
||||
i += 1;
|
||||
}
|
||||
@ -2068,7 +2068,7 @@ mod test_map {
|
||||
let new_cap = m.table.capacity();
|
||||
assert_eq!(new_cap, cap * 2);
|
||||
|
||||
for _ in range(0, cap / 2 - 1) {
|
||||
for _ in 0..cap / 2 - 1 {
|
||||
i -= 1;
|
||||
m.remove(&i);
|
||||
assert_eq!(m.table.capacity(), new_cap);
|
||||
@ -2077,7 +2077,7 @@ mod test_map {
|
||||
m.shrink_to_fit();
|
||||
assert_eq!(m.table.capacity(), cap);
|
||||
// again, a little more than half full
|
||||
for _ in range(0, cap / 2 - 1) {
|
||||
for _ in 0..cap / 2 - 1 {
|
||||
i -= 1;
|
||||
m.remove(&i);
|
||||
}
|
||||
@ -2094,18 +2094,18 @@ mod test_map {
|
||||
m.insert(0u, 0u);
|
||||
m.remove(&0);
|
||||
assert!(m.capacity() >= m.len());
|
||||
for i in range(0, 128) {
|
||||
for i in 0..128 {
|
||||
m.insert(i, i);
|
||||
}
|
||||
m.reserve(256);
|
||||
|
||||
let usable_cap = m.capacity();
|
||||
for i in range(128, 128+256) {
|
||||
for i in 128..128+256 {
|
||||
m.insert(i, i);
|
||||
assert_eq!(m.capacity(), usable_cap);
|
||||
}
|
||||
|
||||
for i in range(100, 128+256) {
|
||||
for i in 100..128+256 {
|
||||
assert_eq!(m.remove(&i), Some(i));
|
||||
}
|
||||
m.shrink_to_fit();
|
||||
@ -2114,7 +2114,7 @@ mod test_map {
|
||||
assert!(!m.is_empty());
|
||||
assert!(m.capacity() >= m.len());
|
||||
|
||||
for i in range(0, 100) {
|
||||
for i in 0..100 {
|
||||
assert_eq!(m.remove(&i), Some(i));
|
||||
}
|
||||
m.shrink_to_fit();
|
||||
@ -2277,12 +2277,12 @@ mod test_map {
|
||||
let mut rng = weak_rng();
|
||||
|
||||
// Populate the map with some items.
|
||||
for _ in range(0u, 50) {
|
||||
for _ in 0u..50 {
|
||||
let x = rng.gen_range(-10, 10);
|
||||
m.insert(x, ());
|
||||
}
|
||||
|
||||
for i in range(0u, 1000) {
|
||||
for i in 0u..1000 {
|
||||
let x = rng.gen_range(-10, 10);
|
||||
match m.entry(x) {
|
||||
Vacant(_) => {},
|
||||
|
@ -1003,7 +1003,7 @@ mod test_set {
|
||||
#[test]
|
||||
fn test_iterate() {
|
||||
let mut a = HashSet::new();
|
||||
for i in range(0u, 32) {
|
||||
for i in 0u..32 {
|
||||
assert!(a.insert(i));
|
||||
}
|
||||
let mut observed: u32 = 0;
|
||||
@ -1201,7 +1201,7 @@ mod test_set {
|
||||
let mut s: HashSet<int> = (1..100).collect();
|
||||
|
||||
// try this a bunch of times to make sure we don't screw up internal state.
|
||||
for _ in range(0i, 20) {
|
||||
for _ in 0i..20 {
|
||||
assert_eq!(s.len(), 99);
|
||||
|
||||
{
|
||||
|
@ -1101,7 +1101,7 @@ mod test {
|
||||
let dir = &tmpdir.join("di_readdir");
|
||||
check!(mkdir(dir, old_io::USER_RWX));
|
||||
let prefix = "foo";
|
||||
for n in range(0i,3) {
|
||||
for n in 0i..3 {
|
||||
let f = dir.join(format!("{}.txt", n));
|
||||
let mut w = check!(File::create(&f));
|
||||
let msg_str = format!("{}{}", prefix, n.to_string());
|
||||
|
@ -663,7 +663,7 @@ mod test {
|
||||
b.bytes = (times * len) as u64;
|
||||
b.iter(|| {
|
||||
let mut wr = MemWriter::new();
|
||||
for _ in range(0, times) {
|
||||
for _ in 0..times {
|
||||
wr.write(src.as_slice()).unwrap();
|
||||
}
|
||||
|
||||
@ -719,7 +719,7 @@ mod test {
|
||||
let buf = [5 as u8; 100].to_vec();
|
||||
{
|
||||
let mut rdr = MemReader::new(buf);
|
||||
for _i in range(0u, 10) {
|
||||
for _i in 0u..10 {
|
||||
let mut buf = [0 as u8; 10];
|
||||
rdr.read(&mut buf).unwrap();
|
||||
assert_eq!(buf.as_slice(), [5; 10].as_slice());
|
||||
@ -734,7 +734,7 @@ mod test {
|
||||
let mut buf = [0 as u8; 100];
|
||||
{
|
||||
let mut wr = BufWriter::new(&mut buf);
|
||||
for _i in range(0u, 10) {
|
||||
for _i in 0u..10 {
|
||||
wr.write(&[5; 10]).unwrap();
|
||||
}
|
||||
}
|
||||
@ -748,7 +748,7 @@ mod test {
|
||||
let buf = [5 as u8; 100];
|
||||
{
|
||||
let mut rdr = BufReader::new(&buf);
|
||||
for _i in range(0u, 10) {
|
||||
for _i in 0u..10 {
|
||||
let mut buf = [0 as u8; 10];
|
||||
rdr.read(&mut buf).unwrap();
|
||||
assert_eq!(buf, [5; 10]);
|
||||
|
@ -390,7 +390,7 @@ mod tests {
|
||||
};
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0u, times) {
|
||||
for _ in 0u..times {
|
||||
let mut stream = UnixStream::connect(&path2);
|
||||
match stream.write(&[100]) {
|
||||
Ok(..) => {}
|
||||
@ -399,7 +399,7 @@ mod tests {
|
||||
}
|
||||
});
|
||||
|
||||
for _ in range(0, times) {
|
||||
for _ in 0..times {
|
||||
let mut client = acceptor.accept();
|
||||
let mut buf = [0];
|
||||
match client.read(&mut buf) {
|
||||
@ -555,7 +555,7 @@ mod tests {
|
||||
tx.send(UnixStream::connect(&addr2).unwrap()).unwrap();
|
||||
});
|
||||
let l = rx.recv().unwrap();
|
||||
for i in range(0u, 1001) {
|
||||
for i in 0u..1001 {
|
||||
match a.accept() {
|
||||
Ok(..) => break,
|
||||
Err(ref e) if e.kind == TimedOut => {}
|
||||
@ -683,7 +683,7 @@ mod tests {
|
||||
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
|
||||
|
||||
s.set_timeout(Some(20));
|
||||
for i in range(0u, 1001) {
|
||||
for i in 0u..1001 {
|
||||
match s.write(&[0; 128 * 1024]) {
|
||||
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
|
||||
Err(IoError { kind: TimedOut, .. }) => break,
|
||||
@ -727,7 +727,7 @@ mod tests {
|
||||
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
|
||||
|
||||
tx.send(()).unwrap();
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
assert!(s.write(&[0;128 * 1024]).is_ok());
|
||||
}
|
||||
}
|
||||
@ -746,7 +746,7 @@ mod tests {
|
||||
|
||||
let mut s = a.accept().unwrap();
|
||||
s.set_write_timeout(Some(20));
|
||||
for i in range(0u, 1001) {
|
||||
for i in 0u..1001 {
|
||||
match s.write(&[0; 128 * 1024]) {
|
||||
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
|
||||
Err(IoError { kind: TimedOut, .. }) => break,
|
||||
|
@ -748,7 +748,7 @@ mod test {
|
||||
let mut acceptor = TcpListener::bind(addr).listen();
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0, max) {
|
||||
for _ in 0..max {
|
||||
let mut stream = TcpStream::connect(addr);
|
||||
stream.write(&[99]).unwrap();
|
||||
}
|
||||
@ -768,7 +768,7 @@ mod test {
|
||||
let mut acceptor = TcpListener::bind(addr).listen();
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0, max) {
|
||||
for _ in 0..max {
|
||||
let mut stream = TcpStream::connect(addr);
|
||||
stream.write(&[99]).unwrap();
|
||||
}
|
||||
@ -1160,7 +1160,7 @@ mod test {
|
||||
tx.send(TcpStream::connect(addr).unwrap()).unwrap();
|
||||
});
|
||||
let _l = rx.recv().unwrap();
|
||||
for i in range(0i, 1001) {
|
||||
for i in 0i..1001 {
|
||||
match a.accept() {
|
||||
Ok(..) => break,
|
||||
Err(ref e) if e.kind == TimedOut => {}
|
||||
@ -1260,7 +1260,7 @@ mod test {
|
||||
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
|
||||
|
||||
s.set_timeout(Some(20));
|
||||
for i in range(0i, 1001) {
|
||||
for i in 0i..1001 {
|
||||
match s.write(&[0; 128 * 1024]) {
|
||||
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
|
||||
Err(IoError { kind: TimedOut, .. }) => break,
|
||||
@ -1299,7 +1299,7 @@ mod test {
|
||||
assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut);
|
||||
|
||||
tx.send(()).unwrap();
|
||||
for _ in range(0i, 100) {
|
||||
for _ in 0i..100 {
|
||||
assert!(s.write(&[0;128 * 1024]).is_ok());
|
||||
}
|
||||
}
|
||||
@ -1318,7 +1318,7 @@ mod test {
|
||||
|
||||
let mut s = a.accept().unwrap();
|
||||
s.set_write_timeout(Some(20));
|
||||
for i in range(0i, 1001) {
|
||||
for i in 0i..1001 {
|
||||
match s.write(&[0; 128 * 1024]) {
|
||||
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
|
||||
Err(IoError { kind: TimedOut, .. }) => break,
|
||||
@ -1388,7 +1388,7 @@ mod test {
|
||||
});
|
||||
|
||||
// Try to ensure that the reading clone is indeed reading
|
||||
for _ in range(0i, 50) {
|
||||
for _ in 0i..50 {
|
||||
::thread::Thread::yield_now();
|
||||
}
|
||||
|
||||
|
@ -448,7 +448,7 @@ mod test {
|
||||
let _b = UdpSocket::bind(addr2).unwrap();
|
||||
|
||||
a.set_write_timeout(Some(1000));
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
match a.send_to(&[0;4*1024], addr2) {
|
||||
Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {},
|
||||
Err(IoError { kind: TimedOut, .. }) => break,
|
||||
|
@ -1142,7 +1142,7 @@ mod tests {
|
||||
fn test_zero() {
|
||||
let mut p = sleeper();
|
||||
p.signal_kill().unwrap();
|
||||
for _ in range(0i, 20) {
|
||||
for _ in 0i..20 {
|
||||
if p.signal(0).is_err() {
|
||||
assert!(!p.wait().unwrap().success());
|
||||
return
|
||||
|
@ -102,7 +102,7 @@ impl TempDir {
|
||||
}
|
||||
|
||||
let mut rng = thread_rng();
|
||||
for _ in range(0, NUM_RETRIES) {
|
||||
for _ in 0..NUM_RETRIES {
|
||||
let suffix: String = rng.gen_ascii_chars().take(NUM_RAND_CHARS).collect();
|
||||
let leaf = if prefix.len() > 0 {
|
||||
format!("{}.{}", prefix, suffix)
|
||||
|
@ -121,7 +121,7 @@ impl Timer {
|
||||
/// let mut timer = Timer::new().unwrap();
|
||||
/// let ten_milliseconds = timer.oneshot(Duration::milliseconds(10));
|
||||
///
|
||||
/// for _ in range(0u, 100) { /* do work */ }
|
||||
/// for _ in 0u..100 { /* do work */ }
|
||||
///
|
||||
/// // blocks until 10 ms after the `oneshot` call
|
||||
/// ten_milliseconds.recv().unwrap();
|
||||
@ -173,12 +173,12 @@ impl Timer {
|
||||
/// let mut timer = Timer::new().unwrap();
|
||||
/// let ten_milliseconds = timer.periodic(Duration::milliseconds(10));
|
||||
///
|
||||
/// for _ in range(0u, 100) { /* do work */ }
|
||||
/// for _ in 0u..100 { /* do work */ }
|
||||
///
|
||||
/// // blocks until 10 ms after the `periodic` call
|
||||
/// ten_milliseconds.recv().unwrap();
|
||||
///
|
||||
/// for _ in range(0u, 100) { /* do work */ }
|
||||
/// for _ in 0u..100 { /* do work */ }
|
||||
///
|
||||
/// // blocks until 20 ms after the `periodic` call (*not* 10ms after the
|
||||
/// // previous `recv`)
|
||||
|
@ -643,7 +643,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
|
||||
// In general it looks like:
|
||||
// res = Vec::new()
|
||||
// let args = [[NSProcessInfo processInfo] arguments]
|
||||
// for i in range(0, [args count])
|
||||
// for i in 0..[args count]
|
||||
// res.push([args objectAtIndex:i])
|
||||
// res
|
||||
#[cfg(target_os = "ios")]
|
||||
@ -679,7 +679,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
|
||||
let args = objc_msgSend(info, argumentsSel);
|
||||
|
||||
let cnt: int = mem::transmute(objc_msgSend(args, countSel));
|
||||
for i in range(0, cnt) {
|
||||
for i in 0..cnt {
|
||||
let tmp = objc_msgSend(args, objectAtSel, i);
|
||||
let utf_c_str: *const libc::c_char =
|
||||
mem::transmute(objc_msgSend(tmp, utf8Sel));
|
||||
|
@ -102,7 +102,7 @@
|
||||
//! let total = 1_000_000;
|
||||
//! let mut in_circle = 0;
|
||||
//!
|
||||
//! for _ in range(0, total) {
|
||||
//! for _ in 0u..total {
|
||||
//! let a = between.ind_sample(&mut rng);
|
||||
//! let b = between.ind_sample(&mut rng);
|
||||
//! if a*a + b*b <= 1. {
|
||||
@ -190,7 +190,7 @@
|
||||
//! let (mut keep_wins, mut keep_losses) = (0, 0);
|
||||
//!
|
||||
//! println!("Running {} simulations...", num_simulations);
|
||||
//! for _ in range(0, num_simulations) {
|
||||
//! for _ in 0..num_simulations {
|
||||
//! let result = simulate(&random_door, &mut rng);
|
||||
//!
|
||||
//! match (result.win, result.switch) {
|
||||
@ -480,14 +480,14 @@ mod test {
|
||||
#[test]
|
||||
fn test_gen_range() {
|
||||
let mut r = thread_rng();
|
||||
for _ in range(0, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
let a = r.gen_range(-3i, 42);
|
||||
assert!(a >= -3 && a < 42);
|
||||
assert_eq!(r.gen_range(0i, 1), 0);
|
||||
assert_eq!(r.gen_range(-12i, -11), -12);
|
||||
}
|
||||
|
||||
for _ in range(0, 1000) {
|
||||
for _ in 0u..1000 {
|
||||
let a = r.gen_range(10i, 42);
|
||||
assert!(a >= 10 && a < 42);
|
||||
assert_eq!(r.gen_range(0i, 1), 0);
|
||||
@ -652,7 +652,7 @@ mod bench {
|
||||
fn rand_xorshift(b: &mut Bencher) {
|
||||
let mut rng: XorShiftRng = OsRng::new().unwrap().gen();
|
||||
b.iter(|| {
|
||||
for _ in range(0, RAND_BENCH_N) {
|
||||
for _ in 0..RAND_BENCH_N {
|
||||
rng.gen::<uint>();
|
||||
}
|
||||
});
|
||||
@ -663,7 +663,7 @@ mod bench {
|
||||
fn rand_isaac(b: &mut Bencher) {
|
||||
let mut rng: IsaacRng = OsRng::new().unwrap().gen();
|
||||
b.iter(|| {
|
||||
for _ in range(0, RAND_BENCH_N) {
|
||||
for _ in 0..RAND_BENCH_N {
|
||||
rng.gen::<uint>();
|
||||
}
|
||||
});
|
||||
@ -674,7 +674,7 @@ mod bench {
|
||||
fn rand_isaac64(b: &mut Bencher) {
|
||||
let mut rng: Isaac64Rng = OsRng::new().unwrap().gen();
|
||||
b.iter(|| {
|
||||
for _ in range(0, RAND_BENCH_N) {
|
||||
for _ in 0..RAND_BENCH_N {
|
||||
rng.gen::<uint>();
|
||||
}
|
||||
});
|
||||
@ -685,7 +685,7 @@ mod bench {
|
||||
fn rand_std(b: &mut Bencher) {
|
||||
let mut rng = StdRng::new().unwrap();
|
||||
b.iter(|| {
|
||||
for _ in range(0, RAND_BENCH_N) {
|
||||
for _ in 0..RAND_BENCH_N {
|
||||
rng.gen::<uint>();
|
||||
}
|
||||
});
|
||||
|
@ -378,7 +378,7 @@ mod test {
|
||||
fn test_os_rng_tasks() {
|
||||
|
||||
let mut txs = vec!();
|
||||
for _ in range(0, 20) {
|
||||
for _ in 0u..20 {
|
||||
let (tx, rx) = channel();
|
||||
txs.push(tx);
|
||||
|
||||
@ -392,7 +392,7 @@ mod test {
|
||||
Thread::yield_now();
|
||||
let mut v = [0u8; 1000];
|
||||
|
||||
for _ in range(0, 100) {
|
||||
for _ in 0u..100 {
|
||||
r.next_u32();
|
||||
Thread::yield_now();
|
||||
r.next_u64();
|
||||
|
@ -18,7 +18,7 @@ use sync::{Mutex, Condvar};
|
||||
/// use std::thread::Thread;
|
||||
///
|
||||
/// let barrier = Arc::new(Barrier::new(10));
|
||||
/// for _ in range(0u, 10) {
|
||||
/// for _ in 0u..10 {
|
||||
/// let c = barrier.clone();
|
||||
/// // The same messages will be printed together.
|
||||
/// // You will NOT see any interleaving.
|
||||
@ -121,7 +121,7 @@ mod tests {
|
||||
let barrier = Arc::new(Barrier::new(N));
|
||||
let (tx, rx) = channel();
|
||||
|
||||
for _ in range(0u, N - 1) {
|
||||
for _ in 0u..N - 1 {
|
||||
let c = barrier.clone();
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
@ -139,7 +139,7 @@ mod tests {
|
||||
let mut leader_found = barrier.wait().is_leader();
|
||||
|
||||
// Now, the barrier is cleared and we should get data.
|
||||
for _ in range(0u, N - 1) {
|
||||
for _ in 0u..N - 1 {
|
||||
if rx.recv().unwrap() {
|
||||
assert!(!leader_found);
|
||||
leader_found = true;
|
||||
|
@ -392,7 +392,7 @@ mod tests {
|
||||
|
||||
let data = Arc::new((Mutex::new(0), Condvar::new()));
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0, N) {
|
||||
for _ in 0..N {
|
||||
let data = data.clone();
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
@ -417,7 +417,7 @@ mod tests {
|
||||
cond.notify_all();
|
||||
drop(cnt);
|
||||
|
||||
for _ in range(0, N) {
|
||||
for _ in 0..N {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
}
|
||||
|
@ -74,14 +74,14 @@
|
||||
//! // where tx is the sending half (tx for transmission), and rx is the receiving
|
||||
//! // half (rx for receiving).
|
||||
//! let (tx, rx) = channel();
|
||||
//! for i in range(0i, 10i) {
|
||||
//! for i in 0i..10i {
|
||||
//! let tx = tx.clone();
|
||||
//! Thread::spawn(move|| {
|
||||
//! tx.send(i).unwrap();
|
||||
//! });
|
||||
//! }
|
||||
//!
|
||||
//! for _ in range(0i, 10i) {
|
||||
//! for _ in 0i..10i {
|
||||
//! let j = rx.recv().unwrap();
|
||||
//! assert!(0 <= j && j < 10);
|
||||
//! }
|
||||
@ -1147,9 +1147,9 @@ mod test {
|
||||
fn stress() {
|
||||
let (tx, rx) = channel::<int>();
|
||||
let t = Thread::scoped(move|| {
|
||||
for _ in range(0u, 10000) { tx.send(1i).unwrap(); }
|
||||
for _ in 0u..10000 { tx.send(1i).unwrap(); }
|
||||
});
|
||||
for _ in range(0u, 10000) {
|
||||
for _ in 0u..10000 {
|
||||
assert_eq!(rx.recv().unwrap(), 1);
|
||||
}
|
||||
t.join().ok().unwrap();
|
||||
@ -1162,7 +1162,7 @@ mod test {
|
||||
let (tx, rx) = channel::<int>();
|
||||
|
||||
let t = Thread::scoped(move|| {
|
||||
for _ in range(0, AMT * NTHREADS) {
|
||||
for _ in 0..AMT * NTHREADS {
|
||||
assert_eq!(rx.recv().unwrap(), 1);
|
||||
}
|
||||
match rx.try_recv() {
|
||||
@ -1171,10 +1171,10 @@ mod test {
|
||||
}
|
||||
});
|
||||
|
||||
for _ in range(0, NTHREADS) {
|
||||
for _ in 0..NTHREADS {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
for _ in range(0, AMT) { tx.send(1).unwrap(); }
|
||||
for _ in 0..AMT { tx.send(1).unwrap(); }
|
||||
});
|
||||
}
|
||||
drop(tx);
|
||||
@ -1187,13 +1187,13 @@ mod test {
|
||||
let (tx2, rx2) = channel::<int>();
|
||||
let t1 = Thread::scoped(move|| {
|
||||
tx1.send(()).unwrap();
|
||||
for _ in range(0i, 40) {
|
||||
for _ in 0i..40 {
|
||||
assert_eq!(rx2.recv().unwrap(), 1);
|
||||
}
|
||||
});
|
||||
rx1.recv().unwrap();
|
||||
let t2 = Thread::scoped(move|| {
|
||||
for _ in range(0i, 40) {
|
||||
for _ in 0i..40 {
|
||||
tx2.send(1).unwrap();
|
||||
}
|
||||
});
|
||||
@ -1205,11 +1205,11 @@ mod test {
|
||||
fn recv_from_outside_runtime() {
|
||||
let (tx, rx) = channel::<int>();
|
||||
let t = Thread::scoped(move|| {
|
||||
for _ in range(0i, 40) {
|
||||
for _ in 0i..40 {
|
||||
assert_eq!(rx.recv().unwrap(), 1);
|
||||
}
|
||||
});
|
||||
for _ in range(0u, 40) {
|
||||
for _ in 0u..40 {
|
||||
tx.send(1).unwrap();
|
||||
}
|
||||
t.join().ok().unwrap();
|
||||
@ -1429,22 +1429,22 @@ mod test {
|
||||
fn recv_a_lot() {
|
||||
// Regression test that we don't run out of stack in scheduler context
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0i, 10000) { tx.send(()).unwrap(); }
|
||||
for _ in range(0i, 10000) { rx.recv().unwrap(); }
|
||||
for _ in 0i..10000 { tx.send(()).unwrap(); }
|
||||
for _ in 0i..10000 { rx.recv().unwrap(); }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_chan_stress() {
|
||||
let (tx, rx) = channel();
|
||||
let total = stress_factor() + 100;
|
||||
for _ in range(0, total) {
|
||||
for _ in 0..total {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
tx.send(()).unwrap();
|
||||
});
|
||||
}
|
||||
|
||||
for _ in range(0, total) {
|
||||
for _ in 0..total {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
}
|
||||
@ -1530,7 +1530,7 @@ mod test {
|
||||
tx2.send(()).unwrap();
|
||||
});
|
||||
// make sure the other task has gone to sleep
|
||||
for _ in range(0u, 5000) { Thread::yield_now(); }
|
||||
for _ in 0u..5000 { Thread::yield_now(); }
|
||||
|
||||
// upgrade to a shared chan and send a message
|
||||
let t = tx.clone();
|
||||
@ -1654,9 +1654,9 @@ mod sync_tests {
|
||||
fn stress() {
|
||||
let (tx, rx) = sync_channel::<int>(0);
|
||||
Thread::spawn(move|| {
|
||||
for _ in range(0u, 10000) { tx.send(1).unwrap(); }
|
||||
for _ in 0u..10000 { tx.send(1).unwrap(); }
|
||||
});
|
||||
for _ in range(0u, 10000) {
|
||||
for _ in 0u..10000 {
|
||||
assert_eq!(rx.recv().unwrap(), 1);
|
||||
}
|
||||
}
|
||||
@ -1669,7 +1669,7 @@ mod sync_tests {
|
||||
let (dtx, drx) = sync_channel::<()>(0);
|
||||
|
||||
Thread::spawn(move|| {
|
||||
for _ in range(0, AMT * NTHREADS) {
|
||||
for _ in 0..AMT * NTHREADS {
|
||||
assert_eq!(rx.recv().unwrap(), 1);
|
||||
}
|
||||
match rx.try_recv() {
|
||||
@ -1679,10 +1679,10 @@ mod sync_tests {
|
||||
dtx.send(()).unwrap();
|
||||
});
|
||||
|
||||
for _ in range(0, NTHREADS) {
|
||||
for _ in 0..NTHREADS {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
for _ in range(0, AMT) { tx.send(1).unwrap(); }
|
||||
for _ in 0..AMT { tx.send(1).unwrap(); }
|
||||
});
|
||||
}
|
||||
drop(tx);
|
||||
@ -1893,22 +1893,22 @@ mod sync_tests {
|
||||
fn recv_a_lot() {
|
||||
// Regression test that we don't run out of stack in scheduler context
|
||||
let (tx, rx) = sync_channel(10000);
|
||||
for _ in range(0u, 10000) { tx.send(()).unwrap(); }
|
||||
for _ in range(0u, 10000) { rx.recv().unwrap(); }
|
||||
for _ in 0u..10000 { tx.send(()).unwrap(); }
|
||||
for _ in 0u..10000 { rx.recv().unwrap(); }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_chan_stress() {
|
||||
let (tx, rx) = sync_channel(0);
|
||||
let total = stress_factor() + 100;
|
||||
for _ in range(0, total) {
|
||||
for _ in 0..total {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
tx.send(()).unwrap();
|
||||
});
|
||||
}
|
||||
|
||||
for _ in range(0, total) {
|
||||
for _ in 0..total {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
}
|
||||
@ -1994,7 +1994,7 @@ mod sync_tests {
|
||||
tx2.send(()).unwrap();
|
||||
});
|
||||
// make sure the other task has gone to sleep
|
||||
for _ in range(0u, 5000) { Thread::yield_now(); }
|
||||
for _ in 0u..5000 { Thread::yield_now(); }
|
||||
|
||||
// upgrade to a shared chan and send a message
|
||||
let t = tx.clone();
|
||||
@ -2082,7 +2082,7 @@ mod sync_tests {
|
||||
rx2.recv().unwrap();
|
||||
}
|
||||
|
||||
for _ in range(0u, 100) {
|
||||
for _ in 0u..100 {
|
||||
repro()
|
||||
}
|
||||
}
|
||||
|
@ -181,11 +181,11 @@ mod tests {
|
||||
let (tx, rx) = channel();
|
||||
let q = Arc::new(q);
|
||||
|
||||
for _ in range(0, nthreads) {
|
||||
for _ in 0..nthreads {
|
||||
let tx = tx.clone();
|
||||
let q = q.clone();
|
||||
Thread::spawn(move|| {
|
||||
for i in range(0, nmsgs) {
|
||||
for i in 0..nmsgs {
|
||||
q.push(i);
|
||||
}
|
||||
tx.send(()).unwrap();
|
||||
@ -200,7 +200,7 @@ mod tests {
|
||||
}
|
||||
}
|
||||
drop(tx);
|
||||
for _ in range(0, nthreads) {
|
||||
for _ in 0..nthreads {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
}
|
||||
|
@ -421,10 +421,10 @@ mod test {
|
||||
let (tx3, rx3) = channel::<int>();
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0u, 20) { Thread::yield_now(); }
|
||||
for _ in 0u..20 { Thread::yield_now(); }
|
||||
tx1.send(1).unwrap();
|
||||
rx3.recv().unwrap();
|
||||
for _ in range(0u, 20) { Thread::yield_now(); }
|
||||
for _ in 0u..20 { Thread::yield_now(); }
|
||||
});
|
||||
|
||||
select! {
|
||||
@ -445,7 +445,7 @@ mod test {
|
||||
let (tx3, rx3) = channel::<()>();
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0u, 20) { Thread::yield_now(); }
|
||||
for _ in 0u..20 { Thread::yield_now(); }
|
||||
tx1.send(1).unwrap();
|
||||
tx2.send(2).unwrap();
|
||||
rx3.recv().unwrap();
|
||||
@ -472,7 +472,7 @@ mod test {
|
||||
let (tx3, rx3) = channel::<()>();
|
||||
|
||||
let _t = Thread::spawn(move|| {
|
||||
for i in range(0, AMT) {
|
||||
for i in 0..AMT {
|
||||
if i % 2 == 0 {
|
||||
tx1.send(i).unwrap();
|
||||
} else {
|
||||
@ -482,7 +482,7 @@ mod test {
|
||||
}
|
||||
});
|
||||
|
||||
for i in range(0, AMT) {
|
||||
for i in 0..AMT {
|
||||
select! {
|
||||
i1 = rx1.recv() => { assert!(i % 2 == 0 && i == i1.unwrap()); },
|
||||
i2 = rx2.recv() => { assert!(i % 2 == 1 && i == i2.unwrap()); }
|
||||
@ -550,7 +550,7 @@ mod test {
|
||||
tx3.send(()).unwrap();
|
||||
});
|
||||
|
||||
for _ in range(0u, 1000) { Thread::yield_now(); }
|
||||
for _ in 0u..1000 { Thread::yield_now(); }
|
||||
drop(tx1.clone());
|
||||
tx2.send(()).unwrap();
|
||||
rx3.recv().unwrap();
|
||||
@ -663,7 +663,7 @@ mod test {
|
||||
tx2.send(()).unwrap();
|
||||
});
|
||||
|
||||
for _ in range(0u, 100) { Thread::yield_now() }
|
||||
for _ in 0u..100 { Thread::yield_now() }
|
||||
tx1.send(()).unwrap();
|
||||
rx2.recv().unwrap();
|
||||
}
|
||||
@ -683,7 +683,7 @@ mod test {
|
||||
tx2.send(()).unwrap();
|
||||
});
|
||||
|
||||
for _ in range(0u, 100) { Thread::yield_now() }
|
||||
for _ in 0u..100 { Thread::yield_now() }
|
||||
tx1.send(()).unwrap();
|
||||
rx2.recv().unwrap();
|
||||
}
|
||||
@ -702,7 +702,7 @@ mod test {
|
||||
tx2.send(()).unwrap();
|
||||
});
|
||||
|
||||
for _ in range(0u, 100) { Thread::yield_now() }
|
||||
for _ in 0u..100 { Thread::yield_now() }
|
||||
tx1.send(()).unwrap();
|
||||
rx2.recv().unwrap();
|
||||
}
|
||||
@ -720,7 +720,7 @@ mod test {
|
||||
fn sync2() {
|
||||
let (tx, rx) = sync_channel::<int>(0);
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0u, 100) { Thread::yield_now() }
|
||||
for _ in 0u..100 { Thread::yield_now() }
|
||||
tx.send(1).unwrap();
|
||||
});
|
||||
select! {
|
||||
|
@ -325,7 +325,7 @@ mod test {
|
||||
let (tx, rx) = channel();
|
||||
let q2 = q.clone();
|
||||
let _t = Thread::spawn(move|| {
|
||||
for _ in range(0u, 100000) {
|
||||
for _ in 0u..100000 {
|
||||
loop {
|
||||
match q2.pop() {
|
||||
Some(1i) => break,
|
||||
@ -336,7 +336,7 @@ mod test {
|
||||
}
|
||||
tx.send(()).unwrap();
|
||||
});
|
||||
for _ in range(0i, 100000) {
|
||||
for _ in 0i..100000 {
|
||||
q.push(1);
|
||||
}
|
||||
rx.recv().unwrap();
|
||||
|
@ -60,7 +60,7 @@ use sys_common::mutex as sys;
|
||||
/// let data = Arc::new(Mutex::new(0));
|
||||
///
|
||||
/// let (tx, rx) = channel();
|
||||
/// for _ in range(0u, 10) {
|
||||
/// for _ in 0u..10 {
|
||||
/// let (data, tx) = (data.clone(), tx.clone());
|
||||
/// Thread::spawn(move || {
|
||||
/// // The shared static can only be accessed once the lock is held.
|
||||
@ -371,7 +371,7 @@ mod test {
|
||||
static K: uint = 3;
|
||||
|
||||
fn inc() {
|
||||
for _ in range(0, J) {
|
||||
for _ in 0..J {
|
||||
unsafe {
|
||||
let _g = M.lock().unwrap();
|
||||
CNT += 1;
|
||||
@ -380,7 +380,7 @@ mod test {
|
||||
}
|
||||
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0, K) {
|
||||
for _ in 0..K {
|
||||
let tx2 = tx.clone();
|
||||
Thread::spawn(move|| { inc(); tx2.send(()).unwrap(); });
|
||||
let tx2 = tx.clone();
|
||||
@ -388,7 +388,7 @@ mod test {
|
||||
}
|
||||
|
||||
drop(tx);
|
||||
for _ in range(0, 2 * K) {
|
||||
for _ in 0..2 * K {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
assert_eq!(unsafe {CNT}, J * K * 2);
|
||||
|
@ -147,10 +147,10 @@ mod test {
|
||||
static mut run: bool = false;
|
||||
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0u, 10) {
|
||||
for _ in 0u..10 {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
for _ in range(0u, 4) { Thread::yield_now() }
|
||||
for _ in 0u..4 { Thread::yield_now() }
|
||||
unsafe {
|
||||
O.call_once(|| {
|
||||
assert!(!run);
|
||||
@ -170,7 +170,7 @@ mod test {
|
||||
assert!(run);
|
||||
}
|
||||
|
||||
for _ in range(0u, 10) {
|
||||
for _ in 0u..10 {
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
}
|
||||
|
@ -416,11 +416,11 @@ mod tests {
|
||||
static M: uint = 1000;
|
||||
|
||||
let (tx, rx) = channel::<()>();
|
||||
for _ in range(0, N) {
|
||||
for _ in 0..N {
|
||||
let tx = tx.clone();
|
||||
Thread::spawn(move|| {
|
||||
let mut rng = rand::thread_rng();
|
||||
for _ in range(0, M) {
|
||||
for _ in 0..M {
|
||||
if rng.gen_weighted_bool(N) {
|
||||
drop(R.write().unwrap());
|
||||
} else {
|
||||
@ -488,7 +488,7 @@ mod tests {
|
||||
|
||||
Thread::spawn(move|| {
|
||||
let mut lock = arc2.write().unwrap();
|
||||
for _ in range(0u, 10) {
|
||||
for _ in 0u..10 {
|
||||
let tmp = *lock;
|
||||
*lock = -1;
|
||||
Thread::yield_now();
|
||||
@ -499,7 +499,7 @@ mod tests {
|
||||
|
||||
// Readers try to catch the writer in the act
|
||||
let mut children = Vec::new();
|
||||
for _ in range(0u, 5) {
|
||||
for _ in 0u..5 {
|
||||
let arc3 = arc.clone();
|
||||
children.push(Thread::scoped(move|| {
|
||||
let lock = arc3.read().unwrap();
|
||||
|
@ -66,7 +66,7 @@ impl<'a> Drop for Sentinel<'a> {
|
||||
/// let pool = TaskPool::new(4u);
|
||||
///
|
||||
/// let (tx, rx) = channel();
|
||||
/// for _ in range(0, 8u) {
|
||||
/// for _ in 0..8u {
|
||||
/// let tx = tx.clone();
|
||||
/// pool.execute(move|| {
|
||||
/// tx.send(1u).unwrap();
|
||||
@ -96,7 +96,7 @@ impl TaskPool {
|
||||
let rx = Arc::new(Mutex::new(rx));
|
||||
|
||||
// Threadpool threads
|
||||
for _ in range(0, threads) {
|
||||
for _ in 0..threads {
|
||||
spawn_in_pool(rx.clone());
|
||||
}
|
||||
|
||||
@ -151,7 +151,7 @@ mod test {
|
||||
let pool = TaskPool::new(TEST_TASKS);
|
||||
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0, TEST_TASKS) {
|
||||
for _ in 0..TEST_TASKS {
|
||||
let tx = tx.clone();
|
||||
pool.execute(move|| {
|
||||
tx.send(1u).unwrap();
|
||||
@ -174,13 +174,13 @@ mod test {
|
||||
let pool = TaskPool::new(TEST_TASKS);
|
||||
|
||||
// Panic all the existing threads.
|
||||
for _ in range(0, TEST_TASKS) {
|
||||
for _ in 0..TEST_TASKS {
|
||||
pool.execute(move|| -> () { panic!() });
|
||||
}
|
||||
|
||||
// Ensure new threads were spawned to compensate.
|
||||
let (tx, rx) = channel();
|
||||
for _ in range(0, TEST_TASKS) {
|
||||
for _ in 0..TEST_TASKS {
|
||||
let tx = tx.clone();
|
||||
pool.execute(move|| {
|
||||
tx.send(1u).unwrap();
|
||||
@ -198,7 +198,7 @@ mod test {
|
||||
let waiter = Arc::new(Barrier::new(TEST_TASKS + 1));
|
||||
|
||||
// Panic all the existing threads in a bit.
|
||||
for _ in range(0, TEST_TASKS) {
|
||||
for _ in 0..TEST_TASKS {
|
||||
let waiter = waiter.clone();
|
||||
pool.execute(move|| {
|
||||
waiter.wait();
|
||||
|
@ -235,7 +235,7 @@ unsafe extern "system" fn on_tls_callback(h: LPVOID,
|
||||
|
||||
unsafe fn run_dtors() {
|
||||
let mut any_run = true;
|
||||
for _ in range(0, 5i) {
|
||||
for _ in 0..5i {
|
||||
if !any_run { break }
|
||||
any_run = false;
|
||||
let dtors = {
|
||||
|
@ -431,7 +431,7 @@ impl CodeMap {
|
||||
let lo = self.lookup_char_pos(sp.lo);
|
||||
let hi = self.lookup_char_pos(sp.hi);
|
||||
let mut lines = Vec::new();
|
||||
for i in range(lo.line - 1us, hi.line as usize) {
|
||||
for i in lo.line - 1us..hi.line as usize {
|
||||
lines.push(i);
|
||||
};
|
||||
FileLines {file: lo.file, lines: lines}
|
||||
|
@ -490,11 +490,11 @@ fn highlight_lines(err: &mut EmitterWriter,
|
||||
// Skip is the number of characters we need to skip because they are
|
||||
// part of the 'filename:line ' part of the previous line.
|
||||
let skip = fm.name.len() + digits + 3us;
|
||||
for _ in range(0, skip) {
|
||||
for _ in 0..skip {
|
||||
s.push(' ');
|
||||
}
|
||||
if let Some(orig) = fm.get_line(lines.lines[0]) {
|
||||
for pos in range(0us, left - skip) {
|
||||
for pos in 0us..left - skip {
|
||||
let cur_char = orig.as_bytes()[pos] as char;
|
||||
// Whenever a tab occurs on the previous line, we insert one on
|
||||
// the error-point-squiggly-line as well (instead of a space).
|
||||
@ -513,7 +513,7 @@ fn highlight_lines(err: &mut EmitterWriter,
|
||||
if hi.col != lo.col {
|
||||
// the ^ already takes up one space
|
||||
let num_squigglies = hi.col.to_usize() - lo.col.to_usize() - 1us;
|
||||
for _ in range(0, num_squigglies) {
|
||||
for _ in 0..num_squigglies {
|
||||
s.push('~');
|
||||
}
|
||||
}
|
||||
@ -563,7 +563,7 @@ fn custom_highlight_lines(w: &mut EmitterWriter,
|
||||
// Span seems to use half-opened interval, so subtract 1
|
||||
let skip = last_line_start.len() + hi.col.to_usize() - 1;
|
||||
let mut s = String::new();
|
||||
for _ in range(0, skip) {
|
||||
for _ in 0..skip {
|
||||
s.push(' ');
|
||||
}
|
||||
s.push('^');
|
||||
|
@ -339,7 +339,7 @@ pub fn parse(sess: &ParseSess,
|
||||
// most of the time.
|
||||
|
||||
// Only touch the binders we have actually bound
|
||||
for idx in range(ei.match_lo, ei.match_hi) {
|
||||
for idx in ei.match_lo..ei.match_hi {
|
||||
let sub = (ei.matches[idx]).clone();
|
||||
(&mut new_pos.matches[idx])
|
||||
.push(Rc::new(MatchedSeq(sub, mk_sp(ei.sp_lo,
|
||||
@ -385,7 +385,7 @@ pub fn parse(sess: &ParseSess,
|
||||
new_ei.match_cur += seq.num_captures;
|
||||
new_ei.idx += 1us;
|
||||
//we specifically matched zero repeats.
|
||||
for idx in range(ei.match_cur, ei.match_cur + seq.num_captures) {
|
||||
for idx in ei.match_cur..ei.match_cur + seq.num_captures {
|
||||
(&mut new_ei.matches[idx]).push(Rc::new(MatchedSeq(vec![], sp)));
|
||||
}
|
||||
|
||||
@ -495,7 +495,7 @@ pub fn parse(sess: &ParseSess,
|
||||
}
|
||||
cur_eis.push(ei);
|
||||
|
||||
for _ in range(0, rust_parser.tokens_consumed) {
|
||||
for _ in 0..rust_parser.tokens_consumed {
|
||||
let _ = rdr.next_token();
|
||||
}
|
||||
}
|
||||
|
@ -732,7 +732,7 @@ impl<'a> StringReader<'a> {
|
||||
let start_bpos = self.last_pos;
|
||||
let mut accum_int = 0;
|
||||
|
||||
for _ in range(0, n_digits) {
|
||||
for _ in 0..n_digits {
|
||||
if self.is_eof() {
|
||||
let last_bpos = self.last_pos;
|
||||
self.fatal_span_(start_bpos, last_bpos, "unterminated numeric character escape");
|
||||
@ -1217,7 +1217,7 @@ impl<'a> StringReader<'a> {
|
||||
}
|
||||
//if self.curr_is('"') {
|
||||
//content_end_bpos = self.last_pos;
|
||||
//for _ in range(0, hash_count) {
|
||||
//for _ in 0..hash_count {
|
||||
//self.bump();
|
||||
//if !self.curr_is('#') {
|
||||
//continue 'outer;
|
||||
@ -1225,7 +1225,7 @@ impl<'a> StringReader<'a> {
|
||||
match c {
|
||||
'"' => {
|
||||
content_end_bpos = self.last_pos;
|
||||
for _ in range(0, hash_count) {
|
||||
for _ in 0..hash_count {
|
||||
self.bump();
|
||||
if !self.curr_is('#') {
|
||||
continue 'outer;
|
||||
@ -1402,7 +1402,7 @@ impl<'a> StringReader<'a> {
|
||||
},
|
||||
Some('"') => {
|
||||
content_end_bpos = self.last_pos;
|
||||
for _ in range(0, hash_count) {
|
||||
for _ in 0..hash_count {
|
||||
self.bump();
|
||||
if !self.curr_is('#') {
|
||||
continue 'outer;
|
||||
|
@ -472,7 +472,7 @@ pub fn str_lit(lit: &str) -> String {
|
||||
} else {
|
||||
// otherwise, a normal escape
|
||||
let (c, n) = char_lit(&lit[i..]);
|
||||
for _ in range(0, n - 1) { // we don't need to move past the first \
|
||||
for _ in 0..n - 1 { // we don't need to move past the first \
|
||||
chars.next();
|
||||
}
|
||||
res.push(c);
|
||||
@ -635,7 +635,7 @@ pub fn binary_lit(lit: &str) -> Rc<Vec<u8>> {
|
||||
// otherwise, a normal escape
|
||||
let (c, n) = byte_lit(&lit[i..]);
|
||||
// we don't need to move past the first \
|
||||
for _ in range(0, n - 1) {
|
||||
for _ in 0..n - 1 {
|
||||
chars.next();
|
||||
}
|
||||
res.push(c);
|
||||
|
@ -2457,7 +2457,7 @@ impl<'a> State<'a> {
|
||||
try!(word(&mut self.s, "<"));
|
||||
|
||||
let mut ints = Vec::new();
|
||||
for i in range(0us, total) {
|
||||
for i in 0us..total {
|
||||
ints.push(i);
|
||||
}
|
||||
|
||||
|
@ -226,7 +226,7 @@ pub fn parse(file: &mut old_io::Reader, longnames: bool)
|
||||
|
||||
let mut bools_map = HashMap::new();
|
||||
if bools_bytes != 0 {
|
||||
for i in range(0, bools_bytes) {
|
||||
for i in 0..bools_bytes {
|
||||
let b = try!(file.read_byte());
|
||||
if b == 1 {
|
||||
bools_map.insert(bnames[i as uint].to_string(), true);
|
||||
@ -240,7 +240,7 @@ pub fn parse(file: &mut old_io::Reader, longnames: bool)
|
||||
|
||||
let mut numbers_map = HashMap::new();
|
||||
if numbers_count != 0 {
|
||||
for i in range(0, numbers_count) {
|
||||
for i in 0..numbers_count {
|
||||
let n = try!(file.read_le_u16());
|
||||
if n != 0xFFFF {
|
||||
numbers_map.insert(nnames[i as uint].to_string(), n);
|
||||
@ -252,7 +252,7 @@ pub fn parse(file: &mut old_io::Reader, longnames: bool)
|
||||
|
||||
if string_offsets_count != 0 {
|
||||
let mut string_offsets = Vec::with_capacity(10);
|
||||
for _ in range(0, string_offsets_count) {
|
||||
for _ in 0..string_offsets_count {
|
||||
string_offsets.push(try!(file.read_le_u16()));
|
||||
}
|
||||
|
||||
|
@ -1008,7 +1008,7 @@ impl Bencher {
|
||||
pub fn iter<T, F>(&mut self, mut inner: F) where F: FnMut() -> T {
|
||||
self.dur = Duration::span(|| {
|
||||
let k = self.iterations;
|
||||
for _ in range(0u64, k) {
|
||||
for _ in 0u64..k {
|
||||
black_box(inner());
|
||||
}
|
||||
});
|
||||
|
@ -40,19 +40,19 @@ fn ascending<M: MutableMap>(map: &mut M, n_keys: uint) {
|
||||
println!(" Ascending integers:");
|
||||
|
||||
timed("insert", || {
|
||||
for i in range(0u, n_keys) {
|
||||
for i in 0u..n_keys {
|
||||
map.insert(i, i + 1);
|
||||
}
|
||||
});
|
||||
|
||||
timed("search", || {
|
||||
for i in range(0u, n_keys) {
|
||||
for i in 0u..n_keys {
|
||||
assert_eq!(map.find(&i).unwrap(), &(i + 1));
|
||||
}
|
||||
});
|
||||
|
||||
timed("remove", || {
|
||||
for i in range(0, n_keys) {
|
||||
for i in 0..n_keys {
|
||||
assert!(map.remove(&i));
|
||||
}
|
||||
});
|
||||
@ -74,7 +74,7 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
|
||||
});
|
||||
|
||||
timed("remove", || {
|
||||
for i in range(0, n_keys) {
|
||||
for i in 0..n_keys {
|
||||
assert!(map.remove(&i));
|
||||
}
|
||||
});
|
||||
@ -82,19 +82,19 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
|
||||
|
||||
fn vector<M: MutableMap>(map: &mut M, n_keys: uint, dist: &[uint]) {
|
||||
timed("insert", || {
|
||||
for i in range(0u, n_keys) {
|
||||
for i in 0u..n_keys {
|
||||
map.insert(dist[i], i + 1);
|
||||
}
|
||||
});
|
||||
|
||||
timed("search", || {
|
||||
for i in range(0u, n_keys) {
|
||||
for i in 0u..n_keys {
|
||||
assert_eq!(map.find(&dist[i]).unwrap(), &(i + 1));
|
||||
}
|
||||
});
|
||||
|
||||
timed("remove", || {
|
||||
for i in range(0u, n_keys) {
|
||||
for i in 0u..n_keys {
|
||||
assert!(map.remove(&dist[i]));
|
||||
}
|
||||
});
|
||||
|
@ -71,11 +71,11 @@ impl Results {
|
||||
{
|
||||
let mut set = f();
|
||||
timed(&mut self.sequential_ints, || {
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
set.insert(i);
|
||||
}
|
||||
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
assert!(set.contains(&i));
|
||||
}
|
||||
})
|
||||
@ -84,7 +84,7 @@ impl Results {
|
||||
{
|
||||
let mut set = f();
|
||||
timed(&mut self.random_ints, || {
|
||||
for _ in range(0, num_keys) {
|
||||
for _ in 0..num_keys {
|
||||
set.insert(rng.gen::<uint>() % rand_cap);
|
||||
}
|
||||
})
|
||||
@ -92,12 +92,12 @@ impl Results {
|
||||
|
||||
{
|
||||
let mut set = f();
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
set.insert(i);
|
||||
}
|
||||
|
||||
timed(&mut self.delete_ints, || {
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
assert!(set.remove(&i));
|
||||
}
|
||||
})
|
||||
@ -114,11 +114,11 @@ impl Results {
|
||||
{
|
||||
let mut set = f();
|
||||
timed(&mut self.sequential_strings, || {
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
set.insert(i.to_string());
|
||||
}
|
||||
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
assert!(set.contains(&i.to_string()));
|
||||
}
|
||||
})
|
||||
@ -127,7 +127,7 @@ impl Results {
|
||||
{
|
||||
let mut set = f();
|
||||
timed(&mut self.random_strings, || {
|
||||
for _ in range(0, num_keys) {
|
||||
for _ in 0..num_keys {
|
||||
let s = rng.gen::<uint>().to_string();
|
||||
set.insert(s);
|
||||
}
|
||||
@ -136,11 +136,11 @@ impl Results {
|
||||
|
||||
{
|
||||
let mut set = f();
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
set.insert(i.to_string());
|
||||
}
|
||||
timed(&mut self.delete_strings, || {
|
||||
for i in range(0u, num_keys) {
|
||||
for i in 0u..num_keys {
|
||||
assert!(set.remove(&i.to_string()));
|
||||
}
|
||||
})
|
||||
|
@ -76,7 +76,7 @@ fn read_line() {
|
||||
let mut path = Path::new(env!("CFG_SRC_DIR"));
|
||||
path.push("src/test/bench/shootout-k-nucleotide.data");
|
||||
|
||||
for _ in range(0u, 3) {
|
||||
for _ in 0u..3 {
|
||||
let mut reader = BufferedReader::new(File::open(&path).unwrap());
|
||||
for _line in reader.lines() {
|
||||
}
|
||||
@ -126,7 +126,7 @@ fn vec_push_all() {
|
||||
let mut r = rand::thread_rng();
|
||||
|
||||
let mut v = Vec::new();
|
||||
for i in range(0u, 1500) {
|
||||
for i in 0u..1500 {
|
||||
let mut rv = repeat(i).take(r.gen_range(0u, i + 1)).collect::<Vec<_>>();
|
||||
if r.gen() {
|
||||
v.push_all(rv.as_slice());
|
||||
@ -140,7 +140,7 @@ fn vec_push_all() {
|
||||
|
||||
fn is_utf8_ascii() {
|
||||
let mut v : Vec<u8> = Vec::new();
|
||||
for _ in range(0u, 20000) {
|
||||
for _ in 0u..20000 {
|
||||
v.push('b' as u8);
|
||||
if str::from_utf8(v.as_slice()).is_err() {
|
||||
panic!("from_utf8 panicked");
|
||||
@ -151,7 +151,7 @@ fn is_utf8_ascii() {
|
||||
fn is_utf8_multibyte() {
|
||||
let s = "b¢€𤭢";
|
||||
let mut v : Vec<u8> = Vec::new();
|
||||
for _ in range(0u, 5000) {
|
||||
for _ in 0u..5000 {
|
||||
v.push_all(s.as_bytes());
|
||||
if str::from_utf8(v.as_slice()).is_err() {
|
||||
panic!("from_utf8 panicked");
|
||||
|
@ -22,7 +22,7 @@ fn main() {
|
||||
|
||||
let n = args[1].parse().unwrap();
|
||||
|
||||
for i in range(0u, n) {
|
||||
for i in 0u..n {
|
||||
let x = i.to_string();
|
||||
println!("{}", x);
|
||||
}
|
||||
|
@ -61,10 +61,10 @@ fn run(args: &[String]) {
|
||||
let dur = Duration::span(|| {
|
||||
let (to_child, to_parent, from_parent) = p.take().unwrap();
|
||||
let mut worker_results = Vec::new();
|
||||
for _ in range(0u, workers) {
|
||||
for _ in 0u..workers {
|
||||
let to_child = to_child.clone();
|
||||
worker_results.push(Thread::scoped(move|| {
|
||||
for _ in range(0u, size / workers) {
|
||||
for _ in 0u..size / workers {
|
||||
//println!("worker {}: sending {} bytes", i, num_bytes);
|
||||
to_child.send(request::bytes(num_bytes)).unwrap();
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ fn run(args: &[String]) {
|
||||
let from_parent = if workers == 1 {
|
||||
let (to_child, from_parent) = channel();
|
||||
worker_results.push(Thread::scoped(move|| {
|
||||
for _ in range(0u, size / workers) {
|
||||
for _ in 0u..size / workers {
|
||||
//println!("worker {}: sending {} bytes", i, num_bytes);
|
||||
to_child.send(request::bytes(num_bytes));
|
||||
}
|
||||
@ -66,10 +66,10 @@ fn run(args: &[String]) {
|
||||
from_parent
|
||||
} else {
|
||||
let (to_child, from_parent) = channel();
|
||||
for _ in range(0u, workers) {
|
||||
for _ in 0u..workers {
|
||||
let to_child = to_child.clone();
|
||||
worker_results.push(Thread::scoped(move|| {
|
||||
for _ in range(0u, size / workers) {
|
||||
for _ in 0u..size / workers {
|
||||
//println!("worker {}: sending {} bytes", i, num_bytes);
|
||||
to_child.send(request::bytes(num_bytes));
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
|
||||
let mut num_chan = Some(num_chan);
|
||||
let mut num_port = Some(num_port);
|
||||
// Send/Receive lots of messages.
|
||||
for j in range(0u, count) {
|
||||
for j in 0u..count {
|
||||
//println!("task %?, iter %?", i, j);
|
||||
let num_chan2 = num_chan.take().unwrap();
|
||||
let num_port2 = num_port.take().unwrap();
|
||||
@ -84,7 +84,7 @@ fn main() {
|
||||
// create the ring
|
||||
let mut futures = Vec::new();
|
||||
|
||||
for i in range(1u, num_tasks) {
|
||||
for i in 1u..num_tasks {
|
||||
//println!("spawning %?", i);
|
||||
let (new_chan, num_port) = init();
|
||||
let num_chan_2 = num_chan.clone();
|
||||
|
@ -104,17 +104,17 @@ fn main() {
|
||||
let mut pixels = [0f32; 256*256];
|
||||
let n2d = Noise2DContext::new();
|
||||
|
||||
for _ in range(0u, 100) {
|
||||
for y in range(0u, 256) {
|
||||
for x in range(0u, 256) {
|
||||
for _ in 0u..100 {
|
||||
for y in 0u..256 {
|
||||
for x in 0u..256 {
|
||||
let v = n2d.get(x as f32 * 0.1, y as f32 * 0.1);
|
||||
pixels[y*256+x] = v * 0.5 + 0.5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for y in range(0u, 256) {
|
||||
for x in range(0u, 256) {
|
||||
for y in 0u..256 {
|
||||
for x in 0u..256 {
|
||||
let idx = (pixels[y*256+x] / 0.2) as uint;
|
||||
print!("{}", symbols[idx]);
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ fn ping_pong_bench(n: uint, m: uint) {
|
||||
|
||||
let guard_a = Thread::scoped(move|| {
|
||||
let (tx, rx) = (atx, brx);
|
||||
for _ in range(0, n) {
|
||||
for _ in 0..n {
|
||||
tx.send(()).unwrap();
|
||||
rx.recv().unwrap();
|
||||
}
|
||||
@ -45,7 +45,7 @@ fn ping_pong_bench(n: uint, m: uint) {
|
||||
|
||||
let guard_b = Thread::scoped(move|| {
|
||||
let (tx, rx) = (btx, arx);
|
||||
for _ in range(0, n) {
|
||||
for _ in 0..n {
|
||||
rx.recv().unwrap();
|
||||
tx.send(()).unwrap();
|
||||
}
|
||||
@ -55,7 +55,7 @@ fn ping_pong_bench(n: uint, m: uint) {
|
||||
guard_b.join().ok();
|
||||
}
|
||||
|
||||
for _ in range(0, m) {
|
||||
for _ in 0..m {
|
||||
run_pair(n)
|
||||
}
|
||||
}
|
||||
|
@ -200,7 +200,7 @@ fn rendezvous(nn: uint, set: Vec<Color>) {
|
||||
let mut creatures_met = 0;
|
||||
|
||||
// set up meetings...
|
||||
for _ in range(0, nn) {
|
||||
for _ in 0..nn {
|
||||
let fst_creature = from_creatures.recv().unwrap();
|
||||
let snd_creature = from_creatures.recv().unwrap();
|
||||
|
||||
|
@ -78,7 +78,7 @@ struct Perm {
|
||||
impl Perm {
|
||||
fn new(n: u32) -> Perm {
|
||||
let mut fact = [1; 16];
|
||||
for i in range(1, n as uint + 1) {
|
||||
for i in 1..n as uint + 1 {
|
||||
fact[i] = fact[i - 1] * i as u32;
|
||||
}
|
||||
Perm {
|
||||
@ -106,7 +106,7 @@ impl Perm {
|
||||
}
|
||||
|
||||
let d = d as uint;
|
||||
for j in range(0, i + 1) {
|
||||
for j in 0..i + 1 {
|
||||
self.perm.p[j] = if j + d <= i {pp[j + d]} else {pp[j+d-i-1]} as i32;
|
||||
}
|
||||
}
|
||||
|
@ -193,14 +193,14 @@ impl<'a, W: Writer> RandomFasta<'a, W> {
|
||||
let chars_left = n % LINE_LEN;
|
||||
let mut buf = [0;LINE_LEN + 1];
|
||||
|
||||
for _ in range(0, lines) {
|
||||
for i in range(0u, LINE_LEN) {
|
||||
for _ in 0..lines {
|
||||
for i in 0u..LINE_LEN {
|
||||
buf[i] = self.nextc();
|
||||
}
|
||||
buf[LINE_LEN] = '\n' as u8;
|
||||
try!(self.out.write(&buf));
|
||||
}
|
||||
for i in range(0u, chars_left) {
|
||||
for i in 0u..chars_left {
|
||||
buf[i] = self.nextc();
|
||||
}
|
||||
self.out.write(&buf[..chars_left])
|
||||
|
@ -92,7 +92,7 @@ fn make_fasta<W: Writer, I: Iterator<Item=u8>>(
|
||||
let mut line = [0u8; LINE_LENGTH + 1];
|
||||
while n > 0 {
|
||||
let nb = min(LINE_LENGTH, n);
|
||||
for i in range(0, nb) {
|
||||
for i in 0..nb {
|
||||
line[i] = it.next().unwrap();
|
||||
}
|
||||
n -= nb;
|
||||
|
@ -84,7 +84,7 @@ impl Code {
|
||||
fn unpack(&self, frame: uint) -> String {
|
||||
let mut key = self.hash();
|
||||
let mut result = Vec::new();
|
||||
for _ in range(0, frame) {
|
||||
for _ in 0..frame {
|
||||
result.push(unpack_symbol((key as u8) & 3));
|
||||
key >>= 2;
|
||||
}
|
||||
@ -242,7 +242,7 @@ fn generate_frequencies(mut input: &[u8], frame: uint) -> Table {
|
||||
let mut code = Code(0);
|
||||
|
||||
// Pull first frame.
|
||||
for _ in range(0, frame) {
|
||||
for _ in 0..frame {
|
||||
code = code.push_char(input[0]);
|
||||
input = &input[1..];
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ fn mandelbrot<W: old_io::Writer>(w: uint, mut out: W) -> old_io::IoResult<()> {
|
||||
};
|
||||
|
||||
// This assumes w == h
|
||||
for x in range(start, end) {
|
||||
for x in start..end {
|
||||
let xf = x as f64;
|
||||
let xy = f64x2(xf, xf);
|
||||
|
||||
@ -165,7 +165,7 @@ fn write_line(init_i: f64, vec_init_r: &[f64], res: &mut Vec<u8>) {
|
||||
let mut i_sq = v_init_i * v_init_i;
|
||||
|
||||
let mut b = 0;
|
||||
for _ in range(0, ITER) {
|
||||
for _ in 0..ITER {
|
||||
let r = cur_r;
|
||||
let i = cur_i;
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user