mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove std::vec::eachi. Same function as iter2.

Browse source
This commit is contained in:
Brian Anderson 2011-10-27 20:50:10 -07:00
parent 1a89e589a4
commit f1f0e6c06c
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/lib/vec.rs
View file

@ -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; }
}
/*