From 4f15b0d97528d57d3dd8b4fa8dc27fad41a9ebf6 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 26 Sep 2012 15:59:37 -0700 Subject: std: Fix mode warnings in fun_treemap and list --- src/libstd/fun_treemap.rs | 4 ++-- src/libstd/list.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/fun_treemap.rs b/src/libstd/fun_treemap.rs index 714d6c93ffa..778a62eebbe 100644 --- a/src/libstd/fun_treemap.rs +++ b/src/libstd/fun_treemap.rs @@ -60,7 +60,7 @@ fn find(m: Treemap, +k: K) -> Option { } /// Visit all pairs in the map in order. -fn traverse(m: Treemap, f: fn(K, V)) { +fn traverse(m: Treemap, f: fn((&K), (&V))) { match *m { Empty => (), /* @@ -72,7 +72,7 @@ fn traverse(m: Treemap, f: fn(K, V)) { // copy v to make aliases work out let v1 = v; traverse(left, f); - f(k, v1); + f(&k, &v1); traverse(right, f); } } diff --git a/src/libstd/list.rs b/src/libstd/list.rs index b4e8678f6ae..297720cbde9 100644 --- a/src/libstd/list.rs +++ b/src/libstd/list.rs @@ -32,7 +32,7 @@ fn from_vec(v: &[T]) -> @List { */ fn foldl(+z: T, ls: @List, f: fn((&T), (&U)) -> T) -> T { let mut accum: T = z; - do iter(ls) |elt| { accum = f(&accum, &elt);} + do iter(ls) |elt| { accum = f(&accum, elt);} accum } @@ -121,11 +121,11 @@ pure fn push(ll: &mut @list, +vv: T) { */ /// Iterate over a list -fn iter(l: @List, f: fn(T)) { +fn iter(l: @List, f: fn((&T))) { let mut cur = l; loop { cur = match *cur { - Cons(hd, tl) => { + Cons(ref hd, tl) => { f(hd); tl } -- cgit 1.4.1-3-g733a5