From d953a5ce43ba2adecb50780c7debd3fea6248996 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Mon, 29 Apr 2013 00:03:55 -0400
Subject: replace old_iter::repeat with the Times trait

---
 src/libstd/base64.rs         |  6 +-----
 src/libstd/timer.rs          | 13 ++++++-------
 src/libstd/uv_global_loop.rs |  4 ++--
 src/libstd/uv_iotask.rs      |  4 ++--
 4 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index 68242f88fae..57833e607ae 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -10,10 +10,6 @@
 
 //! Base64 binary-to-text encoding
 
-use core::old_iter;
-use core::str;
-use core::vec;
-
 pub trait ToBase64 {
     fn to_base64(&self) -> ~str;
 }
@@ -152,7 +148,7 @@ impl FromBase64 for ~[u8] {
         while i < len {
             let mut n = 0u;
 
-            for old_iter::repeat(4u) {
+            for 4u.times {
                 let ch = self[i] as char;
                 n <<= 6u;
 
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index e9fd0414244..52dc095b092 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -188,7 +188,7 @@ mod test {
     #[test]
     fn test_gl_timer_sleep_stress1() {
         let hl_loop = &uv::global_loop::get();
-        for old_iter::repeat(50u) {
+        for 50u.times {
             sleep(hl_loop, 1u);
         }
     }
@@ -208,8 +208,7 @@ mod test {
 
         };
 
-        for old_iter::repeat(repeat) {
-
+        for repeat.times {
             let ch = ch.clone();
             for spec.each |spec| {
                 let (times, maxms) = *spec;
@@ -218,7 +217,7 @@ mod test {
                 do task::spawn {
                     use core::rand::*;
                     let mut rng = rng();
-                    for old_iter::repeat(times) {
+                    for times.times {
                         sleep(&hl_loop_clone, rng.next() as uint % maxms);
                     }
                     ch.send(());
@@ -226,7 +225,7 @@ mod test {
             }
         }
 
-        for old_iter::repeat(repeat * spec.len()) {
+        for (repeat * spec.len()).times {
             po.recv()
         }
     }
@@ -244,7 +243,7 @@ mod test {
         let mut failures = 0;
         let hl_loop = uv::global_loop::get();
 
-        for old_iter::repeat(times as uint) {
+        for (times as uint).times {
             task::yield();
 
             let expected = rand::rng().gen_str(16u);
@@ -273,7 +272,7 @@ mod test {
         let mut failures = 0;
         let hl_loop = uv::global_loop::get();
 
-        for old_iter::repeat(times as uint) {
+        for (times as uint).times {
             let mut rng = rand::rng();
             let expected = Cell(rng.gen_str(16u));
             let (test_po, test_ch) = stream::<~str>();
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index c7b5d9eef72..d1471ba1e77 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -215,7 +215,7 @@ mod test {
         let (exit_po, exit_ch) = stream::<()>();
         let exit_ch = SharedChan::new(exit_ch);
         let cycles = 5000u;
-        for old_iter::repeat(cycles) {
+        for cycles.times {
             let exit_ch_clone = exit_ch.clone();
             task::spawn_sched(task::ManualThreads(1u), || {
                 let hl_loop = &get_gl();
@@ -223,7 +223,7 @@ mod test {
                 exit_ch_clone.send(());
             });
         };
-        for old_iter::repeat(cycles) {
+        for cycles.times {
             exit_po.recv();
         };
         debug!(~"test_stress_gl_uv_global_loop_high_level_global_timer"+
diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs
index 2922f403f34..b40f657ad7f 100644
--- a/src/libstd/uv_iotask.rs
+++ b/src/libstd/uv_iotask.rs
@@ -284,7 +284,7 @@ fn test_uv_iotask_async() {
     // impl_uv_hl_async() runs have been called, at least.
     let (work_exit_po, work_exit_ch) = stream::<()>();
     let work_exit_ch = SharedChan::new(work_exit_ch);
-    for old_iter::repeat(7u) {
+    for 7u.times {
         let iotask_clone = iotask.clone();
         let work_exit_ch_clone = work_exit_ch.clone();
         do task::spawn_sched(task::ManualThreads(1u)) {
@@ -294,7 +294,7 @@ fn test_uv_iotask_async() {
             work_exit_ch_clone.send(());
         };
     };
-    for old_iter::repeat(7u) {
+    for 7u.times {
         debug!("waiting");
         work_exit_po.recv();
     };
-- 
cgit 1.4.1-3-g733a5