nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #15472 : luqmana/rust/snaps, r=alexcrichton

Browse Source
This commit is contained in:
bors 2014-07-06 07:31:38 +00:00
commit 85d33e1aa1
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libcore/cmp.rs
View File

@ -38,8 +38,6 @@
//! ``` //! ```
use option::{Option, Some}; use option::{Option, Some};
#[cfg(stage0)]
use option::None;
/// Trait for values that can be compared for equality and inequality. /// 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 { pub trait PartialOrd: PartialEq {
/// This method returns an ordering between `self` and `other` values /// This method returns an ordering between `self` and `other` values
/// if one exists. /// 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>; fn partial_cmp(&self, other: &Self) -> Option<Ordering>;
/// This method tests less than (for `self` and `other`) and is used by the `<` operator. /// This method tests less than (for `self` and `other`) and is used by the `<` operator.

8
src/snapshots.txt
View File

@ -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 S 2014-06-25 bab614f
freebsd-x86_64 14cb361c8fdefa2534bb6776a04815c08680ecd6 freebsd-x86_64 14cb361c8fdefa2534bb6776a04815c08680ecd6
linux-i386 8fec4845626c557431a4aa7bfb2b5cfc65ad9eda linux-i386 8fec4845626c557431a4aa7bfb2b5cfc65ad9eda