From 9c8b0c60062a60f6f2022e5639147ac372b1d582 Mon Sep 17 00:00:00 2001 From: Kevin Cantu Date: Sun, 2 Sep 2012 18:09:48 -0700 Subject: [PATCH] Demode treemap.rs --- src/libstd/treemap.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs index 8eee59e029c..3d8a5dc86fa 100644 --- a/src/libstd/treemap.rs +++ b/src/libstd/treemap.rs @@ -5,6 +5,8 @@ * very naive algorithm, but it will probably be updated to be a * red-black tree or something else. */ +#[forbid(deprecated_mode)]; +#[forbid(deprecated_pattern)]; use core::cmp::{Eq, Ord}; use core::option::{Some, None}; @@ -30,7 +32,7 @@ enum tree_node = { fn treemap() -> treemap { @mut None } /// Insert a value into the map -fn insert(m: &mut tree_edge, k: K, v: V) { +fn insert(m: &mut tree_edge, +k: K, +v: V) { match copy *m { None => { *m = Some(@tree_node({key: k, @@ -52,7 +54,7 @@ fn insert(m: &mut tree_edge, k: K, v: V) { } /// Find a value based on the key -fn find(m: &const tree_edge, k: K) +fn find(m: &const tree_edge, +k: K) -> Option { match copy *m { None => None, @@ -124,7 +126,7 @@ fn traverse_in_order() { insert(m, 1, ()); let n = @mut 0; - fn t(n: @mut int, &&k: int, &&_v: ()) { + fn t(n: @mut int, +k: int, +_v: ()) { assert (*n == k); *n += 1; } traverse(m, |x,y| t(n, x, y)); -- GitLab