Skip to content
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
34 changes: 33 additions & 1 deletion src/libcore/cmp.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
Expand Down Expand Up @@ -218,6 +218,29 @@ mod impls {
}
impl<'a, T: TotalEq> TotalEq for &'a T {}

// &mut pointers
impl<'a, T: Eq> Eq for &'a mut T {
#[inline]
fn eq(&self, other: &&'a mut T) -> bool { **self == *(*other) }
#[inline]
fn ne(&self, other: &&'a mut T) -> bool { **self != *(*other) }
}
impl<'a, T: Ord> Ord for &'a mut T {
#[inline]
fn lt(&self, other: &&'a mut T) -> bool { **self < **other }
#[inline]
fn le(&self, other: &&'a mut T) -> bool { **self <= **other }
#[inline]
fn ge(&self, other: &&'a mut T) -> bool { **self >= **other }
#[inline]
fn gt(&self, other: &&'a mut T) -> bool { **self > **other }
}
impl<'a, T: TotalOrd> TotalOrd for &'a mut T {
#[inline]
fn cmp(&self, other: &&'a mut T) -> Ordering { (**self).cmp(*other) }
}
impl<'a, T: TotalEq> TotalEq for &'a mut T {}

// @ pointers
impl<T:Eq> Eq for @T {
#[inline]
Expand Down Expand Up @@ -278,6 +301,15 @@ mod test {
assert_eq!(12u.cmp(-5), Greater);
}

#[test]
fn test_mut_int_totalord() {
assert_eq!((&mut 5u).cmp(&10), Less);
assert_eq!((&mut 10u).cmp(&5), Greater);
assert_eq!((&mut 5u).cmp(&5), Equal);
assert_eq!((&mut -5u).cmp(&12), Less);
assert_eq!((&mut 12u).cmp(-5), Greater);
}

#[test]
fn test_ordering_order() {
assert!(Less < Equal);
Expand Down
3 changes: 3 additions & 0 deletions src/libstd/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,9 @@ impl<T: Show> Show for Box<T> {
impl<'a, T: Show> Show for &'a T {
fn fmt(&self, f: &mut Formatter) -> Result { secret_show(*self, f) }
}
impl<'a, T: Show> Show for &'a mut T {
fn fmt(&self, f: &mut Formatter) -> Result { secret_show(*self, f) }
}

impl Bool for bool {
fn fmt(&self, f: &mut Formatter) -> Result {
Expand Down