Merge pull request rust-lang#42 from Techcable/fix/deserialize-hasher

Fix serde deserialization for custom hashers.

Author: bluss

src/serde.rs

@@ -27,13 +27,14 @@ impl<K, V, S> Serialize for OrderMap<K, V, S>
     }
 }
 
-struct OrderMapVisitor<K, V>(PhantomData<(K, V)>);
+struct OrderMapVisitor<K, V, S>(PhantomData<(K, V, S)>);
 
-impl<'de, K, V> Visitor<'de> for OrderMapVisitor<K, V>
+impl<'de, K, V, S> Visitor<'de> for OrderMapVisitor<K, V, S>
     where K: Deserialize<'de> + Eq + Hash,
-          V: Deserialize<'de>
+          V: Deserialize<'de>,
+          S: Default + BuildHasher
 {
-    type Value = OrderMap<K, V>;
+    type Value = OrderMap<K, V, S>;
 
     fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
         write!(formatter, "a map")
@@ -42,7 +43,7 @@ impl<'de, K, V> Visitor<'de> for OrderMapVisitor<K, V>
     fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
         where A: MapAccess<'de>
     {
-        let mut values = OrderMap::with_capacity(map.size_hint().unwrap_or(0));
+        let mut values = OrderMap::with_capacity_and_hasher(map.size_hint().unwrap_or(0), Default::default());
 
         while let Some((key, value)) = try!(map.next_entry()) {
             values.insert(key, value);
@@ -53,9 +54,10 @@ impl<'de, K, V> Visitor<'de> for OrderMapVisitor<K, V>
 }
 
 /// Requires crate feature `"serde-1"`
-impl<'de, K, V> Deserialize<'de> for OrderMap<K, V>
+impl<'de, K, V, S> Deserialize<'de> for OrderMap<K, V, S>
     where K: Deserialize<'de> + Eq + Hash,
-          V: Deserialize<'de>
+          V: Deserialize<'de>,
+          S: Default + BuildHasher
 {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer<'de>

tests/serde.rs

@@ -3,6 +3,7 @@
 #[macro_use]
 extern crate ordermap;
 extern crate serde_test;
+extern crate fnv;
 
 use serde_test::{Token, assert_tokens};
 
@@ -17,3 +18,17 @@ fn test_serde() {
                     Token::I32(4),
                     Token::MapEnd]);
 }
+
+#[test]
+fn test_serde_fnv_hasher() {
+    let mut map: ::ordermap::OrderMap<i32, i32, ::fnv::FnvBuildHasher> = Default::default();
+    map.insert(1, 2);
+    map.insert(3, 4);
+    assert_tokens(&map,
+                  &[Token::Map { len: Some(2) },
+                    Token::I32(1),
+                    Token::I32(2),
+                    Token::I32(3),
+                    Token::I32(4),
+                    Token::MapEnd]);
+}