Skip to content

Commit 7d81c80

Browse files
committed
auto merge of #6388 : recrack/rust/each2_mut, r=pcwalton
- vec.rs :add 'each2_mut function' - testsuit : run-pass/vec-each2_mut.rs
2 parents ad5bfd6 + 1d1c502 commit 7d81c80

File tree

2 files changed

+69
-2
lines changed

2 files changed

+69
-2
lines changed

src/libcore/vec.rs

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,8 +1681,8 @@ pub fn eachi_reverse<'r,T>(v: &'r [T],
16811681
*/
16821682
#[inline]
16831683
pub fn _each2<U, T>(v1: &[U], v2: &[T], f: &fn(u: &U, t: &T) -> bool) -> bool {
1684-
assert!(len(v1) == len(v2));
1685-
for uint::range(0u, len(v1)) |i| {
1684+
assert!(v1.len() == v2.len());
1685+
for uint::range(0u, v1.len()) |i| {
16861686
if !f(&v1[i], &v2[i]) {
16871687
return false;
16881688
}
@@ -1699,6 +1699,35 @@ pub fn each2<U, T>(v1: &[U], v2: &[T], f: &fn(u: &U, t: &T) -> bool) -> bool {
16991699
_each2(v1, v2, f)
17001700
}
17011701
1702+
/**
1703+
*
1704+
* Iterates over two vector with mutable.
1705+
*
1706+
* # Failure
1707+
*
1708+
* Both vectors must have the same length
1709+
*/
1710+
#[inline]
1711+
pub fn _each2_mut<U, T>(v1: &mut [U], v2: &mut [T], f: &fn(u: &mut U, t: &mut T) -> bool) -> bool {
1712+
assert!(v1.len() == v2.len());
1713+
for uint::range(0u, v1.len()) |i| {
1714+
if !f(&mut v1[i], &mut v2[i]) {
1715+
return false;
1716+
}
1717+
}
1718+
return true;
1719+
}
1720+
1721+
#[cfg(stage0)]
1722+
pub fn each2_mut<U, T>(v1: &mut [U], v2: &mut [T], f: &fn(u: &mut U, t: &mut T) -> bool) {
1723+
_each2_mut(v1, v2, f);
1724+
}
1725+
1726+
#[cfg(not(stage0))]
1727+
pub fn each2_mut<U, T>(v1: &mut [U], v2: &mut [T], f: &fn(u: &mut U, t: &mut T) -> bool) -> bool {
1728+
_each2_mut(v1, v2, f)
1729+
}
1730+
17021731
/**
17031732
* Iterate over all permutations of vector `v`.
17041733
*

src/test/run-pass/vec-each2_mut.rs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// -*- rust -*-
12+
fn main(){
13+
let mut t1 = ~[];
14+
t1.push('a');
15+
16+
let mut t2 = ~[];
17+
t2.push('b');
18+
19+
for vec::each2_mut(t1, t2) | i1, i2 | {
20+
assert!(*i1 == 'a');
21+
assert!(*i2 == 'b');
22+
}
23+
24+
for vec::each2(t1, t2) | i1, i2 | {
25+
io::println(fmt!("after t1: %?, t2: %?", i1, i2));
26+
}
27+
28+
for vec::each2_mut(t1, t2) | i1, i2 | {
29+
*i1 = 'b';
30+
*i2 = 'a';
31+
assert!(*i1 == 'b');
32+
assert!(*i2 == 'a');
33+
}
34+
35+
for vec::each2(t1, t2) | i1, i2 | {
36+
io::println(fmt!("before t1: %?, t2: %?", i1, i2));
37+
}
38+
}

0 commit comments

Comments
 (0)