Skip to content

Commit d7d7d70

Browse files
committed
---
yaml --- r: 54550 b: refs/heads/snap-stage3 c: 5641777 h: refs/heads/master v: v3
1 parent bc90cd9 commit d7d7d70

File tree

3 files changed

+190
-172
lines changed

3 files changed

+190
-172
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: a3f40184bdc0d094ac76b15f66bfbf87a699a705
4+
refs/heads/snap-stage3: 5641777318239926363207f690bf265f7514a63c
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/cmp.rs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,32 +64,14 @@ totaleq_impl!(i64)
6464
totaleq_impl!(int)
6565
totaleq_impl!(uint)
6666

67-
#[deriving(Clone, Eq)]
68-
pub enum Ordering { Less = -1, Equal = 0, Greater = 1 }
67+
#[deriving(Eq)]
68+
pub enum Ordering { Less, Equal, Greater }
6969

7070
/// Trait for types that form a total order
7171
pub trait TotalOrd: TotalEq {
7272
fn cmp(&self, other: &Self) -> Ordering;
7373
}
7474

75-
impl TotalOrd for Ordering {
76-
#[inline(always)]
77-
fn cmp(&self, other: &Ordering) -> Ordering {
78-
(*self as int).cmp(&(*other as int))
79-
}
80-
}
81-
82-
impl Ord for Ordering {
83-
#[inline(always)]
84-
fn lt(&self, other: &Ordering) -> bool { (*self as int) < (*other as int) }
85-
#[inline(always)]
86-
fn le(&self, other: &Ordering) -> bool { (*self as int) <= (*other as int) }
87-
#[inline(always)]
88-
fn gt(&self, other: &Ordering) -> bool { (*self as int) > (*other as int) }
89-
#[inline(always)]
90-
fn ge(&self, other: &Ordering) -> bool { (*self as int) >= (*other as int) }
91-
}
92-
9375
macro_rules! totalord_impl(
9476
($t:ty) => {
9577
impl TotalOrd for $t {
@@ -198,10 +180,4 @@ mod test {
198180
assert!(5.equals(&5));
199181
assert!(!2.equals(&17));
200182
}
201-
202-
#[test]
203-
fn test_ordering_order() {
204-
assert!(Less < Equal);
205-
assert_eq!(Greater.cmp(&Less), Greater);
206-
}
207183
}

0 commit comments

Comments
 (0)