From bba701c59d84eac4e20d0796ec06db8d1cdd39cf Mon Sep 17 00:00:00 2001 From: Alex Crichton 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/libstd/vec.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstd/vec.rs') diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 3cac6fadb94..916ba083b3e 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -12,7 +12,7 @@ use RawVec = raw::Vec; use clone::Clone; -use cmp::{PartialOrd, PartialEq, Ordering, TotalEq, TotalOrd, max}; +use cmp::{PartialOrd, PartialEq, Ordering, Eq, Ord, max}; use container::{Container, Mutable}; use default::Default; use fmt; @@ -27,7 +27,7 @@ use ptr; use raw::Slice; use rt::heap::{allocate, reallocate, deallocate}; use slice::{ImmutableEqVector, ImmutableVector, Items, MutItems, MutableVector}; -use slice::{MutableTotalOrdVector, OwnedVector, Vector}; +use slice::{MutableOrdVector, OwnedVector, Vector}; use slice::{MutableVectorAllocating}; /// An owned, growable vector. @@ -388,9 +388,9 @@ impl PartialOrd for Vec { } } -impl TotalEq for Vec {} +impl Eq for Vec {} -impl TotalOrd for Vec { +impl Ord for Vec { #[inline] fn cmp(&self, other: &Vec) -> Ordering { self.as_slice().cmp(&other.as_slice()) @@ -1263,7 +1263,7 @@ impl Vec { } } -impl Vec { +impl Vec { /// Sorts the vector in place. /// /// This sort is `O(n log n)` worst-case and stable, but allocates -- cgit 1.4.1-3-g733a5