OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement Eq for HashSet and HashMap

Browse Source 
Also fix documentation references to PartialEq.
This commit is contained in:
Steven Fackler 2014-06-05 23:22:01 -07:00 committed by Alex Crichton
parent 1bde6e3fcb
commit b662aa5ec0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/collections/hashmap.rs
View File

@ -684,8 +684,8 @@ impl DefaultResizePolicy {
/// denial-of-service attacks (Hash DoS). This behaviour can be /// denial-of-service attacks (Hash DoS). This behaviour can be
/// overridden with one of the constructors. /// overridden with one of the constructors.
/// ///
/// It is required that the keys implement the `PartialEq` and `Hash` traits, although /// It is required that the keys implement the `Eq` and `Hash` traits, although
/// this can frequently be achieved by using `#[deriving(PartialEq, Hash)]`. /// this can frequently be achieved by using `#[deriving(Eq, Hash)]`.
/// ///
/// Relevant papers/articles: /// Relevant papers/articles:
/// ///
@ -1422,6 +1422,8 @@ impl<K: Eq + Hash<S>, V: PartialEq, S, H: Hasher<S>> PartialEq for HashMap<K, V,
} }
} }
impl<K: Eq + Hash<S>, V: Eq, S, H: Hasher<S>> Eq for HashMap<K, V, H> {}
impl<K: Eq + Hash<S> + Show, V: Show, S, H: Hasher<S>> Show for HashMap<K, V, H> { impl<K: Eq + Hash<S> + Show, V: Show, S, H: Hasher<S>> Show for HashMap<K, V, H> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(write!(f, r"\{")); try!(write!(f, r"\{"));
@ -1486,7 +1488,7 @@ pub type SetMoveItems<K> =
/// An implementation of a hash set using the underlying representation of a /// An implementation of a hash set using the underlying representation of a
/// HashMap where the value is (). As with the `HashMap` type, a `HashSet` /// HashMap where the value is (). As with the `HashMap` type, a `HashSet`
/// requires that the elements implement the `PartialEq` and `Hash` traits. /// requires that the elements implement the `Eq` and `Hash` traits.
#[deriving(Clone)] #[deriving(Clone)]
pub struct HashSet<T, H = sip::SipHasher> { pub struct HashSet<T, H = sip::SipHasher> {
map: HashMap<T, (), H> map: HashMap<T, (), H>
@ -1500,6 +1502,8 @@ impl<T: Eq + Hash<S>, S, H: Hasher<S>> PartialEq for HashSet<T, H> {
} }
} }
impl<T: Eq + Hash<S>, S, H: Hasher<S>> Eq for HashSet<T, H> {}
impl<T: Eq + Hash<S>, S, H: Hasher<S>> Container for HashSet<T, H> { impl<T: Eq + Hash<S>, S, H: Hasher<S>> Container for HashSet<T, H> {
fn len(&self) -> uint { self.map.len() } fn len(&self) -> uint { self.map.len() }
} }