wip

serde2/src/de.rs

@@ -1,6 +1,5 @@
 use std::collections::{HashMap, BTreeMap};
-use std::collections::hash_map::Hasher;
+use std::hash::{Hash, Hasher};
-use std::hash::Hash;
 use std::num::FromPrimitive;
 use std::str;
 
@@ -595,11 +594,12 @@ tuple_impls! {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct HashMapVisitor<K, V>;
+struct HashMapVisitor<K, V, H>;
 
-impl<K, V> Visitor for HashMapVisitor<K, V>
+impl<K, V, H> Visitor for HashMapVisitor<K, V, H>
-    where K: Deserialize + Eq + Hash,
+    where K: Deserialize + Eq + Hash<H>,
-          V: Deserialize
+          V: Deserialize,
+          H: Hasher,
 {
     type Value = HashMap<K, V>;
 

serde2/src/ser.rs

@@ -586,10 +586,7 @@ impl<K, V, S, H> Serialize for HashMap<K, V, S>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-impl<
+impl<'a, T> Serialize for &'a T where T: Serialize {
-    'a,
-    T: Serialize,
-> Serialize for &'a T {
     #[inline]
     fn visit<
         V: Visitor,
@@ -598,10 +595,7 @@ impl<
     }
 }
 
-impl<
+impl<'a, T> Serialize for Box<T> where T: Serialize {
-    'a,
-    T: Serialize,
-> Serialize for Box<T> {
     #[inline]
     fn visit<
         V: Visitor,