Merge pull request #20155 from tbu-/pr_vecmap_fiximpls

Fix `collections::VecMap`'s `PartialEq` implementation

Reviewed-by: Gankro
This commit is contained in:
bors 2014-12-23 09:31:26 +00:00
commit 658529467d
2 changed files with 12 additions and 4 deletions

View File

@ -1295,9 +1295,6 @@ impl<A: PartialEq> PartialEq for RingBuf<A> {
self.len() == other.len() &&
self.iter().zip(other.iter()).all(|(a, b)| a.eq(b))
}
fn ne(&self, other: &RingBuf<A>) -> bool {
!self.eq(other)
}
}
impl<A: Eq> Eq for RingBuf<A> {}

View File

@ -60,7 +60,6 @@ use vec::Vec;
/// months.clear();
/// assert!(months.is_empty());
/// ```
#[deriving(PartialEq, Eq)]
pub struct VecMap<V> {
v: Vec<Option<V>>,
}
@ -492,6 +491,14 @@ impl<V:Clone> VecMap<V> {
}
}
impl<V: PartialEq> PartialEq for VecMap<V> {
fn eq(&self, other: &VecMap<V>) -> bool {
iter::order::eq(self.iter(), other.iter())
}
}
impl<V: Eq> Eq for VecMap<V> {}
impl<V: PartialOrd> PartialOrd for VecMap<V> {
#[inline]
fn partial_cmp(&self, other: &VecMap<V>) -> Option<Ordering> {
@ -955,6 +962,10 @@ mod test_map {
assert!(a != b);
assert!(b.insert(5, 19).is_none());
assert!(a == b);
a = VecMap::new();
b = VecMap::with_capacity(1);
assert!(a == b);
}
#[test]