diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs index 36d919494f13..ff8a054700f3 100644 --- a/src/libstd/treemap.rs +++ b/src/libstd/treemap.rs @@ -526,9 +526,8 @@ pure fn each_reverse(node: &Option<~TreeNode>, } // Remove left horizontal link by rotating right -fn skew(node: ~TreeNode) -> ~TreeNode { +fn skew(mut node: ~TreeNode) -> ~TreeNode { if node.left.map_default(false, |x| x.level == node.level) { - let mut node = node; let mut save = node.left.swap_unwrap(); node.left <-> save.right; // save.right now None save.right = Some(node); @@ -540,10 +539,9 @@ fn skew(node: ~TreeNode) -> ~TreeNode { // Remove dual horizontal link by rotating left and increasing level of // the parent -fn split(node: ~TreeNode) -> ~TreeNode { +fn split(mut node: ~TreeNode) -> ~TreeNode { if node.right.map_default(false, |x| x.right.map_default(false, |y| y.level == node.level)) { - let mut node = node; let mut save = node.right.swap_unwrap(); node.right <-> save.left; // save.left now None save.left = Some(node); @@ -582,8 +580,7 @@ fn remove(node: &mut Option<~TreeNode>, key: &K) -> bool { fn heir_swap(node: &mut TreeNode, child: &mut Option<~TreeNode>) { // *could* be done without recursion, but it won't borrow check - do child.mutate |child| { - let mut child = child; + do child.mutate |mut child| { if child.right.is_some() { heir_swap(&mut *node, &mut child.right); } else { @@ -636,15 +633,13 @@ fn remove(node: &mut Option<~TreeNode>, key: &K) -> bool { save.level -= 1; if right_level > save.level { - do save.right.mutate |x| { - let mut x = x; x.level = save.level; x - } + do save.right.mutate |mut x| { x.level = save.level; x } } save = skew(save); - do save.right.mutate |right| { - let mut right = skew(right); + do save.right.mutate |mut right| { + right = skew(right); right.right.mutate(skew); right }