diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-31 10:43:52 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-01 10:31:27 -0700 |
| commit | bba701c59d84eac4e20d0796ec06db8d1cdd39cf (patch) | |
| tree | 3c2109ca567bbc7e7b8d66da7282dac8f8926da6 /src/libstd/vec.rs | |
| parent | c605c2b57b412402e6b491e91852fd9dbadeb551 (diff) | |
| download | rust-bba701c59d84eac4e20d0796ec06db8d1cdd39cf.tar.gz rust-bba701c59d84eac4e20d0796ec06db8d1cdd39cf.zip | |
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]
Diffstat (limited to 'src/libstd/vec.rs')
| -rw-r--r-- | src/libstd/vec.rs | 10 |
1 files changed, 5 insertions, 5 deletions
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<T: PartialOrd> PartialOrd for Vec<T> { } } -impl<T: TotalEq> TotalEq for Vec<T> {} +impl<T: Eq> Eq for Vec<T> {} -impl<T: TotalOrd> TotalOrd for Vec<T> { +impl<T: Ord> Ord for Vec<T> { #[inline] fn cmp(&self, other: &Vec<T>) -> Ordering { self.as_slice().cmp(&other.as_slice()) @@ -1263,7 +1263,7 @@ impl<T> Vec<T> { } } -impl<T:TotalOrd> Vec<T> { +impl<T:Ord> Vec<T> { /// Sorts the vector in place. /// /// This sort is `O(n log n)` worst-case and stable, but allocates |
