From 333f35338e725cd5a41974394bea2ffe5a34a8ad Mon Sep 17 00:00:00 2001 From: Sunjay Varma Date: Tue, 1 Oct 2019 23:37:06 -0400 Subject: [PATCH] Added FromStream and Extend impls for HashMap --- src/collections/hash_map/extend.rs | 36 +++++++++++++++++++++++++ src/collections/hash_map/from_stream.rs | 27 +++++++++++++++++++ src/collections/hash_map/mod.rs | 7 +++++ src/collections/mod.rs | 2 ++ 4 files changed, 72 insertions(+) create mode 100644 src/collections/hash_map/extend.rs create mode 100644 src/collections/hash_map/from_stream.rs create mode 100644 src/collections/hash_map/mod.rs diff --git a/src/collections/hash_map/extend.rs b/src/collections/hash_map/extend.rs new file mode 100644 index 00000000..68bc79e3 --- /dev/null +++ b/src/collections/hash_map/extend.rs @@ -0,0 +1,36 @@ +use std::pin::Pin; +use std::hash::{Hash, BuildHasher}; +use std::collections::HashMap; + +use crate::prelude::*; +use crate::stream::{Extend, IntoStream}; + +impl Extend<(K, V)> for HashMap +where K: Eq + Hash, + H: BuildHasher + Default { + fn stream_extend<'a, S: IntoStream + 'a>( + &'a mut self, + stream: S, + ) -> Pin + 'a>> { + let stream = stream.into_stream(); + + // The following is adapted from the hashbrown source code: + // https://github.com/rust-lang/hashbrown/blob/d1ad4fc3aae2ade446738eea512e50b9e863dd0c/src/map.rs#L2470-L2491 + // + // Keys may be already present or show multiple times in the stream. Reserve the entire + // hint lower bound if the map is empty. Otherwise reserve half the hint (rounded up), so + // the map will only resize twice in the worst case. + + //TODO: Add this back in when size_hint is added to Stream/StreamExt + //let reserve = if self.is_empty() { + // stream.size_hint().0 + //} else { + // (stream.size_hint().0 + 1) / 2 + //}; + //self.reserve(reserve); + + Box::pin(stream.for_each(move |(k, v)| { + self.insert(k, v); + })) + } +} diff --git a/src/collections/hash_map/from_stream.rs b/src/collections/hash_map/from_stream.rs new file mode 100644 index 00000000..f9295cb0 --- /dev/null +++ b/src/collections/hash_map/from_stream.rs @@ -0,0 +1,27 @@ +use std::pin::Pin; +use std::hash::{Hash, BuildHasher}; +use std::collections::HashMap; + +use crate::stream::{Extend, FromStream, IntoStream}; + +impl FromStream<(K, V)> for HashMap +where K: Eq + Hash, + H: BuildHasher + Default { + #[inline] + fn from_stream<'a, S: IntoStream>( + stream: S, + ) -> Pin + 'a>> + where + ::IntoStream: 'a, + { + let stream = stream.into_stream(); + + Box::pin(async move { + pin_utils::pin_mut!(stream); + + let mut out = HashMap::with_hasher(Default::default()); + out.stream_extend(stream).await; + out + }) + } +} diff --git a/src/collections/hash_map/mod.rs b/src/collections/hash_map/mod.rs new file mode 100644 index 00000000..6e52dd21 --- /dev/null +++ b/src/collections/hash_map/mod.rs @@ -0,0 +1,7 @@ +//! The Rust hash map, implemented with quadratic probing and SIMD lookup. + +mod extend; +mod from_stream; + +#[doc(inline)] +pub use std::collections::HashMap; diff --git a/src/collections/mod.rs b/src/collections/mod.rs index 8dec302c..93a0614d 100644 --- a/src/collections/mod.rs +++ b/src/collections/mod.rs @@ -4,7 +4,9 @@ //! data structures. pub mod vec_deque; +pub mod hash_map; pub mod btree_map; pub use vec_deque::VecDeque; +pub use hash_map::HashMap; pub use btree_map::BTreeMap;