mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use mutable function argument syntax in treemap

Browse Source
This commit is contained in:
Daniel Micay 2013-01-25 10:51:10 -05:00
parent e447521c1c
commit aff3db26aa
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/treemap.rs
View File

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