Skip to content

Commit eca1d25

Browse files
committed
---
yaml --- r: 30761 b: refs/heads/incoming c: e0d5d03 h: refs/heads/master i: 30759: 97449ad v: v3
1 parent 47127e7 commit eca1d25

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: ef23d77633484e4e85f8b37431e3b08ede3e4802
9+
refs/heads/incoming: e0d5d034513f21859b587a0a0b043967cda62f97
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/tuple.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<T: Copy, U: Copy> (T, U): TupleOps<T,U> {
3636

3737
trait ExtendedTupleOps<A,B> {
3838
fn zip() -> ~[(A, B)];
39-
fn map<C>(f: fn(A, B) -> C) -> ~[C];
39+
fn map<C>(f: &fn(A, B) -> C) -> ~[C];
4040
}
4141

4242
impl<A: Copy, B: Copy> (&[A], &[B]): ExtendedTupleOps<A,B> {
@@ -46,7 +46,7 @@ impl<A: Copy, B: Copy> (&[A], &[B]): ExtendedTupleOps<A,B> {
4646
vec::zip_slice(a, b)
4747
}
4848

49-
fn map<C>(f: fn(A, B) -> C) -> ~[C] {
49+
fn map<C>(f: &fn(A, B) -> C) -> ~[C] {
5050
let (a, b) = self;
5151
vec::map2(a, b, f)
5252
}
@@ -60,7 +60,7 @@ impl<A: Copy, B: Copy> (~[A], ~[B]): ExtendedTupleOps<A,B> {
6060
vec::zip(move a, move b)
6161
}
6262

63-
fn map<C>(f: fn(A, B) -> C) -> ~[C] {
63+
fn map<C>(f: &fn(A, B) -> C) -> ~[C] {
6464
// FIXME #2543: Bad copy
6565
let (a, b) = copy self;
6666
vec::map2(a, b, f)

0 commit comments

Comments
 (0)