Skip to content

Commit 4f9d038

Browse files
committed
---
yaml --- r: 30772 b: refs/heads/incoming c: 4f15b0d h: refs/heads/master v: v3
1 parent 26c17a6 commit 4f9d038

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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: 135ebca8aa1bb546984c1915eac4e5c9bfdcf4d6
9+
refs/heads/incoming: 4f15b0d97528d57d3dd8b4fa8dc27fad41a9ebf6
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/fun_treemap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn find<K: Eq Ord, V: Copy>(m: Treemap<K, V>, +k: K) -> Option<V> {
6060
}
6161

6262
/// Visit all pairs in the map in order.
63-
fn traverse<K, V: Copy>(m: Treemap<K, V>, f: fn(K, V)) {
63+
fn traverse<K, V: Copy>(m: Treemap<K, V>, f: fn((&K), (&V))) {
6464
match *m {
6565
Empty => (),
6666
/*
@@ -72,7 +72,7 @@ fn traverse<K, V: Copy>(m: Treemap<K, V>, f: fn(K, V)) {
7272
// copy v to make aliases work out
7373
let v1 = v;
7474
traverse(left, f);
75-
f(k, v1);
75+
f(&k, &v1);
7676
traverse(right, f);
7777
}
7878
}

branches/incoming/src/libstd/list.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn from_vec<T: Copy>(v: &[T]) -> @List<T> {
3232
*/
3333
fn foldl<T: Copy, U>(+z: T, ls: @List<U>, f: fn((&T), (&U)) -> T) -> T {
3434
let mut accum: T = z;
35-
do iter(ls) |elt| { accum = f(&accum, &elt);}
35+
do iter(ls) |elt| { accum = f(&accum, elt);}
3636
accum
3737
}
3838

@@ -121,11 +121,11 @@ pure fn push<T: Copy>(ll: &mut @list<T>, +vv: T) {
121121
*/
122122

123123
/// Iterate over a list
124-
fn iter<T>(l: @List<T>, f: fn(T)) {
124+
fn iter<T>(l: @List<T>, f: fn((&T))) {
125125
let mut cur = l;
126126
loop {
127127
cur = match *cur {
128-
Cons(hd, tl) => {
128+
Cons(ref hd, tl) => {
129129
f(hd);
130130
tl
131131
}

0 commit comments

Comments
 (0)