From bba701c59d84eac4e20d0796ec06db8d1cdd39cf Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 31 May 2014 10:43:52 -0700
Subject: std: Drop Total from Total{Eq,Ord}

This completes the last stage of the renaming of the comparison hierarchy of
traits. This change renames TotalEq to Eq and TotalOrd to Ord.

In the future the new Eq/Ord will be filled out with their appropriate methods,
but for now this change is purely a renaming change.

[breaking-change]
---
 src/liballoc/owned.rs | 6 +++---
 src/liballoc/rc.rs    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/liballoc')

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) }
 }
-- 
cgit 1.4.1-3-g733a5