Skip to content

Commit eb0473f

Browse files
committed
---
yaml --- r: 50585 b: refs/heads/try c: a5c8836 h: refs/heads/master i: 50583: 951840e v: v3
1 parent 190afe4 commit eb0473f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 58cec701277cc7dd881bb41d7f9469f077574a75
5+
refs/heads/try: a5c88366f83893364533421b3b21306c246c17f3
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/treemap.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ impl<K: TotalOrd, V> Map<K, V> for TreeMap<K, V> {
149149
match *current {
150150
Some(ref r) => {
151151
match key.cmp(&r.key) {
152-
Less => current = &r.left,
153-
Greater => current = &r.right,
154-
Equal => return Some(&r.value)
152+
Less => current = &r.left,
153+
Greater => current = &r.right,
154+
Equal => return Some(&r.value)
155155
}
156156
}
157157
None => return None
@@ -532,15 +532,15 @@ pub impl<K: TotalOrd, V> TreeNode<K, V> {
532532
}
533533

534534
pure fn each<K: TotalOrd, V>(node: &r/Option<~TreeNode<K, V>>,
535-
f: &fn(&(&r/K, &r/V)) -> bool) {
535+
f: &fn(&(&r/K, &r/V)) -> bool) {
536536
for node.each |x| {
537537
each(&x.left, f);
538538
if f(&(&x.key, &x.value)) { each(&x.right, f) }
539539
}
540540
}
541541

542542
pure fn each_reverse<K: TotalOrd, V>(node: &r/Option<~TreeNode<K, V>>,
543-
f: &fn(&(&r/K, &r/V)) -> bool) {
543+
f: &fn(&(&r/K, &r/V)) -> bool) {
544544
for node.each |x| {
545545
each_reverse(&x.right, f);
546546
if f(&(&x.key, &x.value)) { each_reverse(&x.left, f) }
@@ -665,20 +665,20 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
665665
skew(save);
666666

667667
match save.right {
668-
Some(ref mut right) => {
669-
skew(right);
670-
match right.right {
671-
Some(ref mut x) => { skew(x) },
672-
None => ()
673-
}
668+
Some(ref mut right) => {
669+
skew(right);
670+
match right.right {
671+
Some(ref mut x) => { skew(x) },
672+
None => ()
674673
}
675-
None => ()
674+
}
675+
None => ()
676676
}
677677

678678
split(save);
679679
match save.right {
680-
Some(ref mut x) => { split(x) },
681-
None => ()
680+
Some(ref mut x) => { split(x) },
681+
None => ()
682682
}
683683
}
684684

0 commit comments

Comments
 (0)