user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std: remove vec::each2 and vec::each2_mut in favour of iterators

Browse source
This commit is contained in:
Huon Wilson 2013-06-08 01:20:47 +10:00
parent 5e9f006c5b
commit f661a15b2b
10 changed files with 24 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libsyntax/ext/deriving/generic.rs
View file

@ -174,6 +174,7 @@ use opt_vec;
use core::uint;
use core::vec;
use core::iterator::IteratorUtil;
pub use self::ty::*;
mod ty;
@ -616,7 +617,7 @@ impl<'self> MethodDef<'self> {
// make a series of nested matches, to destructure the
// structs. This is actually right-to-left, but it shoudn't
// matter.
for vec::each2(self_args, patterns) |&arg_expr, &pat| {
for self_args.iter().zip(patterns.iter()).advance |(&arg_expr, &pat)| {
body = cx.expr_match(span, arg_expr,
~[ cx.arm(span, ~[pat], body) ])
}
@ -951,7 +952,7 @@ fn create_struct_pattern(cx: @ExtCtxt,
// must be nonempty to reach here
let pattern = if struct_type == Record {
let field_pats = do vec::build |push| {
for vec::each2(subpats, ident_expr) |&pat, &(id, _)| {
for subpats.iter().zip(ident_expr.iter()).advance |(&pat, &(id, _))| {
// id is guaranteed to be Some
push(ast::field_pat { ident: id.get(), pat: pat })
}