(RFC) remove the Times trait in favour of range

src/libextra/arc.rs

@@ -23,7 +23,7 @@
  * let numbers=vec::from_fn(100, |ind| (ind as float)*rand::random());
  * let shared_numbers=arc::Arc::new(numbers);
  *
- *   do 10.times {
+ *   for _ in range(0, 10u) {
  *       let (port, chan)  = stream();
  *       chan.send(shared_numbers.clone());
  *
@@ -759,7 +759,7 @@ mod tests {
 
         do task::spawn || {
             do arc2.write |num| {
-                do 10.times {
+                for _ in range(0, 10u) {
                     let tmp = *num;
                     *num = -1;
                     task::yield();
@@ -771,7 +771,7 @@ mod tests {
 
         // Readers try to catch the writer in the act
         let mut children = ~[];
-        do 5.times {
+        for _ in range(0, 5u) {
             let arc3 = (*arc).clone();
             let mut builder = task::task();
             builder.future_result(|r| children.push(r));
@@ -805,7 +805,7 @@ mod tests {
 
         // Reader tasks
         let mut reader_convos = ~[];
-        do 10.times {
+        for _ in range(0, 10u) {
             let ((rp1,rc1),(rp2,rc2)) = (comm::stream(),comm::stream());
             reader_convos.push((rc1, rp2));
             let arcn = (*arc).clone();
@@ -913,7 +913,7 @@ mod tests {
             do read_mode.read |state| {
                 // if writer mistakenly got in, make sure it mutates state
                 // before we assert on it
-                do 5.times { task::yield(); }
+                for _ in range(0, 5u) { task::yield(); }
                 // make sure writer didn't get in.
                 assert!(*state);
             }
@@ -925,6 +925,6 @@ mod tests {
         // helped to expose the race nearly 100% of the time... but adding
         // yields in the intuitively-right locations made it even less likely,
         // and I wasn't sure why :( . This is a mediocre "next best" option.
-        do 8.times { test_rw_write_cond_downgrade_read_race_helper() }
+        for _ in range(0, 8u) { test_rw_write_cond_downgrade_read_race_helper() }
     }
 }

src/libextra/base64.rs

@@ -314,9 +314,9 @@ mod test {
         use std::rand::{task_rng, random, RngUtil};
         use std::vec;
 
-        do 1000.times {
+        for _ in range(0, 1000u) {
             let v: ~[u8] = do vec::build |push| {
-                do task_rng().gen_uint_range(1, 100).times {
+                for _ in range(0, task_rng().gen_uint_range(1, 100)) {
                     push(random());
                 }
             };

src/libextra/crypto/cryptoutil.rs

@@ -56,7 +56,7 @@ pub fn read_u64v_be(dst: &mut[u64], input: &[u8]) {
     unsafe {
         let mut x: *mut i64 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *i64 = transmute(input.unsafe_ref(0));
-        do dst.len().times() {
+        for _ in range(0, dst.len()) {
             *x = to_be64(*y);
             x = x.offset(1);
             y = y.offset(1);
@@ -72,7 +72,7 @@ pub fn read_u32v_be(dst: &mut[u32], input: &[u8]) {
     unsafe {
         let mut x: *mut i32 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *i32 = transmute(input.unsafe_ref(0));
-        do dst.len().times() {
+        for _ in range(0, dst.len()) {
             *x = to_be32(*y);
             x = x.offset(1);
             y = y.offset(1);
@@ -88,7 +88,7 @@ pub fn read_u32v_le(dst: &mut[u32], input: &[u8]) {
     unsafe {
         let mut x: *mut i32 = transmute(dst.unsafe_mut_ref(0));
         let mut y: *i32 = transmute(input.unsafe_ref(0));
-        do dst.len().times() {
+        for _ in range(0, dst.len()) {
             *x = to_le32(*y);
             x = x.offset(1);
             y = y.offset(1);

src/libextra/dlist.rs

@@ -1024,7 +1024,7 @@ mod tests {
 
     #[test]
     fn test_fuzz() {
-        do 25.times {
+        for _ in range(0, 25u) {
             fuzz_test(3);
             fuzz_test(16);
             fuzz_test(189);

src/libextra/flate.rs

@@ -108,13 +108,13 @@ mod tests {
     fn test_flate_round_trip() {
         let mut r = rand::rng();
         let mut words = ~[];
-        do 20.times {
+        for _ in range(0, 20u) {
             let range = r.gen_uint_range(1, 10);
             words.push(r.gen_bytes(range));
         }
-        do 20.times {
+        for _ in range(0, 20u) {
             let mut input = ~[];
-            do 2000.times {
+            for _ in range(0, 2000u) {
                 input.push_all(r.choose(words));
             }
             debug!("de/inflate of %u bytes of random word-sequences",

src/libextra/getopts.rs

@@ -693,7 +693,7 @@ pub mod groups {
             // here we just need to indent the start of the description
             let rowlen = row.len();
             if rowlen < 24 {
-                do (24 - rowlen).times {
+                for _ in range(0, 24 - rowlen) {
                     row.push_char(' ')
                 }
             } else {

src/libextra/json.rs

@@ -76,7 +76,7 @@ fn escape_str(s: &str) -> ~str {
 
 fn spaces(n: uint) -> ~str {
     let mut ss = ~"";
-    do n.times {
+    for _ in range(0, n) {
         ss.push_str(" ");
     }
     return ss;

src/libextra/ringbuf.rs

@@ -507,7 +507,7 @@ mod tests {
     fn bench_grow(b: &mut test::BenchHarness) {
         let mut deq = RingBuf::new();
         do b.iter {
-            do 65.times {
+            for _ in range(0, 65u) {
                 deq.push_front(1);
             }
         }

src/libextra/sort.rs

@@ -1068,7 +1068,7 @@ mod big_tests {
             tim_sort(arr); // /sort
             isSorted(arr);
 
-            do 3.times {
+            for _ in range(0, 3u) {
                 let i1 = rng.gen_uint_range(0, n);
                 let i2 = rng.gen_uint_range(0, n);
                 arr.swap(i1, i2);
@@ -1087,7 +1087,7 @@ mod big_tests {
             tim_sort(arr); // +sort
             isSorted(arr);
 
-            do (n/100).times {
+            for _ in range(0, n / 100) {
                 let idx = rng.gen_uint_range(0, n);
                 arr[idx] = rng.gen();
             }
@@ -1140,7 +1140,7 @@ mod big_tests {
             tim_sort(arr); // /sort
             isSorted(arr);
 
-            do 3.times {
+            for _ in range(0, 3u) {
                 let i1 = rng.gen_uint_range(0, n);
                 let i2 = rng.gen_uint_range(0, n);
                 arr.swap(i1, i2);
@@ -1159,7 +1159,7 @@ mod big_tests {
             tim_sort(arr); // +sort
             isSorted(arr);
 
-            do (n/100).times {
+            for _ in range(0, n / 100) {
                 let idx = rng.gen_uint_range(0, n);
                 arr[idx] = @rng.gen();
             }

src/libextra/sync.rs

@@ -112,7 +112,7 @@ impl<Q:Send> Sem<Q> {
                 }
             }
             // Uncomment if you wish to test for sem races. Not valgrind-friendly.
-            /* do 1000.times { task::yield(); } */
+            /* for _ in range(0, 1000u) { task::yield(); } */
             // Need to wait outside the exclusive.
             if waiter_nobe.is_some() {
                 let _ = waiter_nobe.unwrap().recv();
@@ -150,7 +150,7 @@ impl Sem<~[WaitQueue]> {
     fn new_and_signal(count: int, num_condvars: uint)
         -> Sem<~[WaitQueue]> {
         let mut queues = ~[];
-        do num_condvars.times {
+        for _ in range(0, num_condvars) {
             queues.push(WaitQueue::new());
         }
         Sem::new(count, queues)
@@ -701,7 +701,6 @@ impl<'self> RWLockReadMode<'self> {
 
 #[cfg(test)]
 mod tests {
-
     use sync::*;
 
     use std::cast;
@@ -731,11 +730,11 @@ mod tests {
         let s2 = ~s.clone();
         do task::spawn || {
             do s2.access {
-                do 5.times { task::yield(); }
+                for _ in range(0, 5u) { task::yield(); }
             }
         }
         do s.access {
-            do 5.times { task::yield(); }
+            for _ in range(0, 5u) { task::yield(); }
         }
     }
     #[test]
@@ -748,7 +747,7 @@ mod tests {
             s2.acquire();
             c.send(());
         }
-        do 5.times { task::yield(); }
+        for _ in range(0, 5u) { task::yield(); }
         s.release();
         let _ = p.recv();
 
@@ -757,7 +756,7 @@ mod tests {
         let s = ~Semaphore::new(0);
         let s2 = ~s.clone();
         do task::spawn || {
-            do 5.times { task::yield(); }
+            for _ in range(0, 5u) { task::yield(); }
             s2.release();
             let _ = p.recv();
         }
@@ -800,7 +799,7 @@ mod tests {
                     c.send(());
                 }
                 let _ = p.recv(); // wait for child to come alive
-                do 5.times { task::yield(); } // let the child contend
+                for _ in range(0, 5u) { task::yield(); } // let the child contend
             }
             let _ = p.recv(); // wait for child to be done
         }
@@ -834,7 +833,7 @@ mod tests {
         }
 
         fn access_shared(sharedstate: &mut int, m: &Mutex, n: uint) {
-            do n.times {
+            for _ in range(0, n) {
                 do m.lock {
                     let oldval = *sharedstate;
                     task::yield();
@@ -880,7 +879,7 @@ mod tests {
         let m = ~Mutex::new();
         let mut ports = ~[];
 
-        do num_waiters.times {
+        for _ in range(0, num_waiters) {
             let mi = ~m.clone();
             let (port, chan) = comm::stream();
             ports.push(port);
@@ -974,7 +973,7 @@ mod tests {
 
         let result: result::Result<(),()> = do task::try || {
             let mut sibling_convos = ~[];
-            do 2.times {
+            for _ in range(0, 2u) {
                 let (p,c) = comm::stream();
                 let c = Cell::new(c);
                 sibling_convos.push(p);
@@ -1111,7 +1110,7 @@ mod tests {
 
         fn access_shared(sharedstate: &mut int, x: &RWLock, mode: RWLockMode,
                          n: uint) {
-            do n.times {
+            for _ in range(0, n) {
                 do lock_rwlock_in_mode(x, mode) {
                     let oldval = *sharedstate;
                     task::yield();
@@ -1242,7 +1241,7 @@ mod tests {
         let x = ~RWLock::new();
         let mut ports = ~[];
 
-        do num_waiters.times {
+        for _ in range(0, num_waiters) {
             let xi = (*x).clone();
             let (port, chan) = comm::stream();
             ports.push(port);

src/libextra/task_pool.rs

@@ -102,7 +102,7 @@ fn test_task_pool() {
         g
     };
     let mut pool = TaskPool::new(4, Some(SingleThreaded), f);
-    do 8.times {
+    for _ in range(0, 8u) {
         pool.execute(|i| printfln!("Hello from thread %u!", *i));
     }
 }

src/libextra/treemap.rs

@@ -1014,8 +1014,8 @@ mod test_treemap {
 
         let mut rng = rand::IsaacRng::new_seeded(&[42]);
 
-        do 3.times {
-            do 90.times {
+        for _ in range(0, 3u) {
+            for _ in range(0, 90u) {
                 let k = rng.gen();
                 let v = rng.gen();
                 if !ctrl.iter().any(|x| x == &(k, v)) {
@@ -1026,7 +1026,7 @@ mod test_treemap {
                 }
             }
 
-            do 30.times {
+            for _ in range(0, 30u) {
                 let r = rng.gen_uint_range(0, ctrl.len());
                 let (key, _) = ctrl.remove(r);
                 assert!(map.remove(&key));

src/librustc/middle/dataflow.rs

@@ -178,7 +178,7 @@ impl<O:DataFlowOperator> DataFlowContext<O> {
         };
         if expanded {
             let entry = if self.oper.initial_value() { uint::max_value } else {0};
-            do self.words_per_id.times {
+            for _ in range(0, self.words_per_id) {
                 self.gens.push(0);
                 self.kills.push(0);
                 self.on_entry.push(entry);

src/librustc/middle/lint.rs

@@ -455,7 +455,7 @@ impl Context {
         if doc_hidden && self.doc_hidden {
             self.doc_hidden = false;
         }
-        do pushed.times {
+        for _ in range(0, pushed) {
             let (lint, lvl, src) = self.lint_stack.pop();
             self.set_level(lint, lvl, src);
         }

src/librustc/middle/privacy.rs

@@ -343,7 +343,7 @@ pub fn check_crate<'mm>(tcx: ty::ctxt,
                                 node_id,
                                 (method_map, visitor));
 
-            do n_added.times {
+            for _ in range(0, n_added) {
                 ignore(privileged_items.pop());
             }
         },
@@ -374,7 +374,7 @@ pub fn check_crate<'mm>(tcx: ty::ctxt,
 
             oldvisit::visit_block(block, (method_map, visitor));
 
-            do n_added.times {
+            for _ in range(0, n_added) {
                 ignore(privileged_items.pop());
             }
         },

src/librustc/middle/trans/consts.rs

@@ -190,7 +190,7 @@ pub fn const_expr(cx: @mut CrateContext, e: @ast::expr) -> ValueRef {
         Some(@ty::AutoDerefRef(ref adj)) => {
             let mut ty = ety;
             let mut maybe_ptr = None;
-            do adj.autoderefs.times {
+            for _ in range(0, adj.autoderefs) {
                 let (dv, dt) = const_deref(cx, llconst, ty, false);
                 maybe_ptr = Some(llconst);
                 llconst = dv;