squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rollup merge of #19779: Noctune/master

Browse source 
The old PartialOrd impl for raw pointers would always return Some(_), so It might as well implement Ord too.
This commit is contained in:
Brian Anderson 2014-12-13 18:23:30 -08:00
commit e8e8677072
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/libcore/ptr.rs
View file

@ -93,7 +93,7 @@ use intrinsics;
use option::Option;
use option::Option::{Some, None};
use cmp::{PartialEq, Eq, PartialOrd, Equiv};
use cmp::{PartialEq, Eq, Ord, PartialOrd, Equiv};
use cmp::Ordering;
use cmp::Ordering::{Less, Equal, Greater};
@ -388,16 +388,23 @@ mod externfnpointers {
}
// Comparison for pointers
impl<T> Ord for *const T {
#[inline]
fn cmp(&self, other: &*const T) -> Ordering {
if self < other {
Less
} else if self == other {
Equal
} else {
Greater
}
}
}
impl<T> PartialOrd for *const T {
#[inline]
fn partial_cmp(&self, other: &*const T) -> Option<Ordering> {
if self < other {
Some(Less)
} else if self == other {
Some(Equal)
} else {
Some(Greater)
}
Some(self.cmp(other))
}
#[inline]
@ -413,16 +420,23 @@ impl<T> PartialOrd for *const T {
fn ge(&self, other: &*const T) -> bool { *self >= *other }
}
impl<T> Ord for *mut T {
#[inline]
fn cmp(&self, other: &*mut T) -> Ordering {
if self < other {
Less
} else if self == other {
Equal
} else {
Greater
}
}
}
impl<T> PartialOrd for *mut T {
#[inline]
fn partial_cmp(&self, other: &*mut T) -> Option<Ordering> {
if self < other {
Some(Less)
} else if self == other {
Some(Equal)
} else {
Some(Greater)
}
Some(self.cmp(other))
}
#[inline]