From f1f0e6c06c9a208bbcbe48292b7a0ee31edbb114 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 27 Oct 2011 20:50:10 -0700
Subject: [PATCH] Remove std::vec::eachi. Same function as iter2.

---
 src/lib/vec.rs | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/lib/vec.rs b/src/lib/vec.rs
index 413d92f85bc5..b6c47ac5c37d 100644
--- a/src/lib/vec.rs
+++ b/src/lib/vec.rs
@@ -637,43 +637,30 @@ fn enum_uints(start: uint, end: uint) : uint::le(start, end) -> [uint] {
     ret r;
 }
 
-/*
-Function: eachi
-
-Iterates over a vector's elements and indexes
-
-Iterates over vector `v` and, for each element, calls function `f`
-with the element's value and index.
-*/
-fn eachi<T>(f: block(T, uint) -> (), v: [mutable? T]) {
-    let i = 0u;
-    let l = len(v);
-    while (i < l) {
-        let elem = v[i];    // Satisfy alias checker
-        f(elem, i);
-        i += 1u;
-    }
-}
-
 /*
 Function: iter
 
 Iterates over a vector
 
-Iterates over vector `v` and, for each element, calls function `f`
+Iterates over vector `v` and, for each element, calls function `f` with the
+element's value.
+
 */
-fn iter<T>(v: [mutable? T], it: block(T)) {
-    iter2(v) { |_i, v| it(v) }
+fn iter<T>(v: [mutable? T], f: block(T)) {
+    iter2(v) { |_i, v| f(v) }
 }
 
 /*
 Function: iter2
 
-FIXME: This is exactly the same as eachi
+Iterates over a vector's elements and indexes
+
+Iterates over vector `v` and, for each element, calls function `f` with the
+element's value and index.
 */
-fn iter2<T>(v: [mutable? T], it: block(uint, T)) {
+fn iter2<T>(v: [mutable? T], f: block(uint, T)) {
     let i = 0u;
-    for x in v { it(i, x); i += 1u; }
+    for x in v { f(i, x); i += 1u; }
 }
 
 /*