Skip to content

Commit f9f5933

Browse files
committed
---
yaml --- r: 138927 b: refs/heads/try2 c: a5c8836 h: refs/heads/master i: 138925: 6eea36a 138923: 1882ef2 138919: b12f278 138911: adf739b v: v3
1 parent 26296b5 commit f9f5933

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 58cec701277cc7dd881bb41d7f9469f077574a75
8+
refs/heads/try2: a5c88366f83893364533421b3b21306c246c17f3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)