diff options
| author | bors <bors@rust-lang.org> | 2014-06-30 05:36:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-30 05:36:25 +0000 |
| commit | e1683f50c00297e9908ae028fa1d41b9a52a6f6f (patch) | |
| tree | e1f34ea8fa1e5c887ed724e41a029cab323ad455 /src/libnum | |
| parent | e25eb6b223d86047dc807a167f3dd4bf492bbf41 (diff) | |
| parent | 55cae0a094bbdcd0e9d5e697ce4f38cbd783bbc7 (diff) | |
| download | rust-e1683f50c00297e9908ae028fa1d41b9a52a6f6f.tar.gz rust-e1683f50c00297e9908ae028fa1d41b9a52a6f6f.zip | |
auto merge of #15030 : sfackler/rust/partial-cmp, r=huonw
I ended up altering the semantics of Json's PartialOrd implementation. It used to be the case that Null < Null, but I can't think of any reason for an ordering other than the default one so I just switched it over to using the derived implementation. This also fixes broken `PartialOrd` implementations for `Vec` and `TreeMap`. # Note This isn't ready to merge yet since libcore tests are broken as you end up with 2 versions of `Option`. The rest should be reviewable though. RFC: 0028-partial-cmp
Diffstat (limited to 'src/libnum')
| -rw-r--r-- | src/libnum/bigint.rs | 8 | ||||
| -rw-r--r-- | src/libnum/rational.rs | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libnum/bigint.rs b/src/libnum/bigint.rs index 9011aafc009..cc3753def59 100644 --- a/src/libnum/bigint.rs +++ b/src/libnum/bigint.rs @@ -91,8 +91,8 @@ impl Eq for BigUint {} impl PartialOrd for BigUint { #[inline] - fn lt(&self, other: &BigUint) -> bool { - self.cmp(other) == Less + fn partial_cmp(&self, other: &BigUint) -> Option<Ordering> { + Some(self.cmp(other)) } } @@ -816,8 +816,8 @@ impl Eq for BigInt {} impl PartialOrd for BigInt { #[inline] - fn lt(&self, other: &BigInt) -> bool { - self.cmp(other) == Less + fn partial_cmp(&self, other: &BigInt) -> Option<Ordering> { + Some(self.cmp(other)) } } diff --git a/src/libnum/rational.rs b/src/libnum/rational.rs index 971b6b1b51b..9a455edf2c0 100644 --- a/src/libnum/rational.rs +++ b/src/libnum/rational.rs @@ -193,7 +193,8 @@ macro_rules! cmp_impl { }; } cmp_impl!(impl PartialEq, eq, ne) -cmp_impl!(impl PartialOrd, lt, gt, le, ge) +cmp_impl!(impl PartialOrd, lt -> bool, gt -> bool, le -> bool, ge -> bool, + partial_cmp -> Option<cmp::Ordering>) cmp_impl!(impl Eq, ) cmp_impl!(impl Ord, cmp -> cmp::Ordering) |
