Skip to content

Commit 6d697e7

Browse files
committed
---
yaml --- r: 42109 b: refs/heads/master c: a388e2c h: refs/heads/master i: 42107: 6807641 v: v3
1 parent b770b97 commit 6d697e7

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3c02e2b61e456c5e63d8d6fb4764596304d14586
2+
refs/heads/master: a388e2c1a49ccb238741e01b9a53aac0f1bf7795
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/treemap.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,14 +652,12 @@ fn remove<K: Ord, V>(node: &mut Option<~TreeNode<K, V>>, key: &K) -> bool {
652652
let mut left = save.left.swap_unwrap();
653653
if left.right.is_some() {
654654
heir_swap(save, &mut left.right);
655-
save.left = Some(left);
656-
remove(&mut save.left, key);
657655
} else {
658656
save.key <-> left.key;
659657
save.value <-> left.value;
660-
save.left = Some(left);
661-
remove(&mut save.left, key);
662658
}
659+
save.left = Some(left);
660+
remove(&mut save.left, key);
663661
} else {
664662
save = save.left.swap_unwrap();
665663
}

0 commit comments

Comments
 (0)