Merge pull request #44 from apasel422/update

Assorted updates

Author: reem

.travis.yml

@@ -1,12 +1,16 @@
 language: rust
-rust:
-    - nightly
 sudo: false
+matrix:
+    include:
+        - rust: beta
+        - rust: nightly
+          env: FEATURES="--features nightly"
 script:
-    - cargo build
-    - cargo test
-    - cargo doc --no-deps
+    - cargo build $FEATURES
+    - cargo test $FEATURES
+    - cargo doc --no-deps $FEATURES
 after_success: |
+    [ $TRAVIS_RUST_VERSION = nightly ] &&
     [ $TRAVIS_BRANCH = master ] &&
     [ $TRAVIS_PULL_REQUEST = false ] &&
     bash deploy-docs.sh

Cargo.toml

@@ -14,3 +14,6 @@ homepage = "https://github.com/contain-rs/linked-hash-map"
 documentation = "https://contain-rs.github.io/linked-hash-map/linked_hash_map"
 keywords = ["data-structures"]
 readme = "README.md"
+
+[features]
+nightly = []

src/lib.rs

@@ -28,7 +28,8 @@
 //! ```
 
 #![forbid(missing_docs)]
-#![cfg_attr(test, feature(test))]
+#![cfg_attr(feature = "nightly", feature(hashmap_public_hasher))]
+#![cfg_attr(all(feature = "nightly", test), feature(test))]
 
 use std::borrow::Borrow;
 use std::cmp::Ordering;
@@ -611,15 +612,22 @@ impl<K: Hash + Eq, V, S: BuildHasher> LinkedHashMap<K, V, S> {
     }
 }
 
-// FIXME: `HashMap` doesn't expose its hash state, so we cannot clone fully parameterized
-// `LinkedHashMap`s without cloning the original map and clearing it. For now, only
-// `LinkedHashMap<K, V>`s implement `Clone`.
+#[cfg(not(feature = "nightly"))]
 impl<K: Hash + Eq + Clone, V: Clone> Clone for LinkedHashMap<K, V> {
     fn clone(&self) -> Self {
         self.iter().map(|(k, v)| (k.clone(), v.clone())).collect()
     }
 }
 
+#[cfg(feature = "nightly")]
+impl<K: Hash + Eq + Clone, V: Clone, S: BuildHasher + Clone> Clone for LinkedHashMap<K, V, S> {
+    fn clone(&self) -> Self {
+        let mut map = Self::with_hash_state(self.map.hasher().clone());
+        map.extend(self.iter().map(|(k, v)| (k.clone(), v.clone())));
+        map
+    }
+}
+
 impl<K: Hash + Eq, V, S: BuildHasher + Default> Default for LinkedHashMap<K, V, S> {
     fn default() -> Self { LinkedHashMap::with_hash_state(Default::default()) }
 }
@@ -632,6 +640,16 @@ impl<K: Hash + Eq, V, S: BuildHasher> Extend<(K, V)> for LinkedHashMap<K, V, S>
     }
 }
 
+impl<'a, K, V, S> Extend<(&'a K, &'a V)> for LinkedHashMap<K, V, S>
+    where K: 'a + Hash + Eq + Copy, V: 'a + Copy, S: BuildHasher,
+{
+    fn extend<I: IntoIterator<Item = (&'a K, &'a V)>>(&mut self, iter: I) {
+        for (&k, &v) in iter {
+            self.insert(k, v);
+        }
+    }
+}
+
 impl<K: Hash + Eq, V, S: BuildHasher + Default> iter::FromIterator<(K, V)> for LinkedHashMap<K, V, S> {
     fn from_iter<I: IntoIterator<Item=(K, V)>>(iter: I) -> Self {
         let iter = iter.into_iter();
@@ -877,7 +895,7 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> IntoIterator for &'a mut LinkedHashMap
     fn into_iter(self) -> IterMut<'a, K, V> { self.iter_mut() }
 }
 
-#[cfg(test)]
+#[cfg(all(feature = "nightly", test))]
 mod bench {
     extern crate test;