diff options
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/owned.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/liballoc/owned.rs b/src/liballoc/owned.rs index 61fff41374b..9377c968272 100644 --- a/src/liballoc/owned.rs +++ b/src/liballoc/owned.rs @@ -12,7 +12,7 @@ use core::any::{Any, AnyRefExt}; use core::clone::Clone; -use core::cmp::{PartialEq, PartialOrd, TotalEq, TotalOrd, Ordering}; +use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::default::Default; use core::fmt; use core::intrinsics; @@ -67,11 +67,11 @@ impl<T:PartialOrd> PartialOrd for Box<T> { #[inline] fn gt(&self, other: &Box<T>) -> bool { *(*self) > *(*other) } } -impl<T: TotalOrd> TotalOrd for Box<T> { +impl<T: Ord> Ord for Box<T> { #[inline] fn cmp(&self, other: &Box<T>) -> Ordering { (**self).cmp(*other) } } -impl<T: TotalEq> TotalEq for Box<T> {} +impl<T: Eq> Eq for Box<T> {} /// Extension methods for an owning `Any` trait object pub trait AnyOwnExt { diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 8bf7f64a719..7177aa3de45 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -26,7 +26,7 @@ pointers, and then storing the parent pointers as `Weak` pointers. use core::mem::transmute; use core::cell::Cell; use core::clone::Clone; -use core::cmp::{PartialEq, PartialOrd, TotalEq, TotalOrd, Ordering}; +use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::kinds::marker; use core::ops::{Deref, Drop}; use core::option::{Option, Some, None}; @@ -157,7 +157,7 @@ impl<T: PartialEq> PartialEq for Rc<T> { fn ne(&self, other: &Rc<T>) -> bool { **self != **other } } -impl<T: TotalEq> TotalEq for Rc<T> {} +impl<T: Eq> Eq for Rc<T> {} impl<T: PartialOrd> PartialOrd for Rc<T> { #[inline(always)] @@ -173,7 +173,7 @@ impl<T: PartialOrd> PartialOrd for Rc<T> { fn ge(&self, other: &Rc<T>) -> bool { **self >= **other } } -impl<T: TotalOrd> TotalOrd for Rc<T> { +impl<T: Ord> Ord for Rc<T> { #[inline] fn cmp(&self, other: &Rc<T>) -> Ordering { (**self).cmp(&**other) } } |
