Skip to content

Commit ccd7dd1

Browse files
committed
---
yaml --- r: 4698 b: refs/heads/master c: 886c2ee h: refs/heads/master v: v3
1 parent 801c058 commit ccd7dd1

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 9e084469afd3b922d631d98296a68023a5763a71
2+
refs/heads/master: 886c2ee93e53ba0082fe16ca9c5c15f07d7f5982

trunk/src/test/run-pass/block-iter-1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ fn main() {
44
let v = ~[1, 2, 3, 4, 5, 6, 7];
55
let odds = 0;
66
iter_vec(v,
7-
block (i: &int) {
7+
{|&i|
88
log_err i;
99
if i % 2 == 1 { odds += 1; }
1010
log_err odds;
1111
});
1212
log_err odds;
1313
assert (odds == 4);
14-
}
14+
}

trunk/src/test/run-pass/block-iter-2.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ fn main() {
44
let v = ~[1, 2, 3, 4, 5];
55
let sum = 0;
66
iter_vec(v,
7-
block (i: &int) {
8-
iter_vec(v,
9-
block (j: &int) { log_err i * j; sum += i * j; });
7+
{|&i|
8+
iter_vec(v, {|&j| log_err i * j; sum += i * j; });
109
});
1110
log_err sum;
1211
assert (sum == 225);
13-
}
12+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
use std;
2+
import std::ivec;
3+
4+
fn main() {
5+
let v = std::ivec::map2({|&i, &b| if b { -i } else { i }},
6+
~[1, 2, 3, 4, 5],
7+
~[true, false, false, true, true]);
8+
log_err v;
9+
assert v == ~[-1, 2, 3, -4, -5];
10+
}

0 commit comments

Comments
 (0)