diff options
| author | bors <bors@rust-lang.org> | 2014-05-30 21:21:39 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-30 21:21:39 -0700 |
| commit | 60a43f9bc5d24b47aae9681fc7ef47d517329e59 (patch) | |
| tree | c0e46f35c6d6482996e6b10eaf635201b51e82d4 /src/libstd/vec.rs | |
| parent | cc4513202d6f9c6896054ebaa1d99230b06e9f10 (diff) | |
| parent | bb96ee6123082908dba86cb22344f0c23915bf06 (diff) | |
| download | rust-60a43f9bc5d24b47aae9681fc7ef47d517329e59.tar.gz rust-60a43f9bc5d24b47aae9681fc7ef47d517329e59.zip | |
auto merge of #14534 : alexcrichton/rust/snapshots, r=sfackler
This is part 2 of the saga of renaming the Partial/Total equality and comparison traits.
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 81f6c7c7c9b..3cac6fadb94 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -12,7 +12,7 @@ use RawVec = raw::Vec; use clone::Clone; -use cmp::{Ord, Eq, Ordering, TotalEq, TotalOrd, max}; +use cmp::{PartialOrd, PartialEq, Ordering, TotalEq, TotalOrd, max}; use container::{Container, Mutable}; use default::Default; use fmt; @@ -374,14 +374,14 @@ impl<T> Extendable<T> for Vec<T> { } } -impl<T: Eq> Eq for Vec<T> { +impl<T: PartialEq> PartialEq for Vec<T> { #[inline] fn eq(&self, other: &Vec<T>) -> bool { self.as_slice() == other.as_slice() } } -impl<T: Ord> Ord for Vec<T> { +impl<T: PartialOrd> PartialOrd for Vec<T> { #[inline] fn lt(&self, other: &Vec<T>) -> bool { self.as_slice() < other.as_slice() @@ -1288,7 +1288,7 @@ impl<T> Mutable for Vec<T> { } } -impl<T:Eq> Vec<T> { +impl<T:PartialEq> Vec<T> { /// Return true if a vector contains an element with the given value /// /// # Example @@ -1315,7 +1315,7 @@ impl<T:Eq> Vec<T> { pub fn dedup(&mut self) { unsafe { // Although we have a mutable reference to `self`, we cannot make - // *arbitrary* changes. The `Eq` comparisons could fail, so we + // *arbitrary* changes. The `PartialEq` comparisons could fail, so we // must ensure that the vector is in a valid state at all time. // // The way that we handle this is by using swaps; we iterate |
