diff options
| author | Luqman Aden <laden@csclub.uwaterloo.ca> | 2014-07-06 02:13:35 -0400 |
|---|---|---|
| committer | Luqman Aden <laden@csclub.uwaterloo.ca> | 2014-07-06 02:13:35 -0400 |
| commit | 3fd2b0dc02162f84521d43424ab502f7fe5ee9ad (patch) | |
| tree | f6ef1d6628d692b18048f61fd5f06c2fd0c98e30 | |
| parent | 832731daced4aaea0016610f7839dc9fc6ae2d4f (diff) | |
| download | rust-3fd2b0dc02162f84521d43424ab502f7fe5ee9ad.tar.gz rust-3fd2b0dc02162f84521d43424ab502f7fe5ee9ad.zip | |
Register snapshot.
| -rw-r--r-- | src/libcore/cmp.rs | 15 | ||||
| -rw-r--r-- | src/snapshots.txt | 8 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 8696d385c44..f374d2e9a27 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -38,8 +38,6 @@ //! ``` use option::{Option, Some}; -#[cfg(stage0)] -use option::None; /// Trait for values that can be compared for equality and inequality. /// @@ -162,19 +160,6 @@ pub fn lexical_ordering(o1: Ordering, o2: Ordering) -> Ordering { pub trait PartialOrd: PartialEq { /// This method returns an ordering between `self` and `other` values /// if one exists. - #[cfg(stage0)] - fn partial_cmp(&self, other: &Self) -> Option<Ordering> { - match (!self.lt(other), !other.lt(self)) { - (false, false) => None, - (false, true) => Some(Less), - (true, false) => Some(Greater), - (true, true) => Some(Equal), - } - } - - /// This method returns an ordering between `self` and `other` values - /// if one exists. - #[cfg(not(stage0))] fn partial_cmp(&self, other: &Self) -> Option<Ordering>; /// This method tests less than (for `self` and `other`) and is used by the `<` operator. diff --git a/src/snapshots.txt b/src/snapshots.txt index 5c694b34193..51676ec06e8 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2014-07-05 aaff4e0 + freebsd-x86_64 10272ca9eb17e1be4a4b172aacfb4b33fffcc8fb + linux-i386 72ba9f6e0d096c30f128cb3736ffac0b57530a20 + linux-x86_64 e5621f84934a7d76002ab95a354fbbb9ae6ebbb1 + macos-i386 a88fd84ee959e59265de12b8f551ed56c0e943df + macos-x86_64 f19d479e5a0d2a6067a05b1910e4a6a544836b0a + winnt-i386 0c5a91e422409b89ac22f8c265af66f759d476c8 + S 2014-06-25 bab614f freebsd-x86_64 14cb361c8fdefa2534bb6776a04815c08680ecd6 linux-i386 8fec4845626c557431a4aa7bfb2b5cfc65ad9eda |