Skip to content

Register snapshot. #15472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/libcore/cmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
//! ```
use option::{Option, Some};
#[cfg(stage0)]
use option::None;

/// Trait for values that can be compared for equality and inequality.
///
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 8 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down