From 75d5f27f8ac4c900c9565f3bafe28080df49f9ff Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sat, 17 Jan 2015 20:56:06 -0800
Subject: [PATCH] wip

---
 serde2/src/de.rs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/serde2/src/de.rs b/serde2/src/de.rs
index 82994079..9a0316df 100644
--- a/serde2/src/de.rs
+++ b/serde2/src/de.rs
@@ -1,5 +1,6 @@
+use std::collections::hash_map::Hasher;
 use std::collections::{HashMap, BTreeMap};
-use std::hash::{Hash, Hasher};
+use std::hash::Hash;
 use std::num::FromPrimitive;
 use std::str;
 
@@ -594,19 +595,18 @@ tuple_impls! {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct HashMapVisitor<K, V, H>;
+struct HashMapVisitor<K, V>;
 
-impl<K, V, H> Visitor for HashMapVisitor<K, V, H>
-    where K: Deserialize + Eq + Hash<H>,
+impl<K, V> Visitor for HashMapVisitor<K, V>
+    where K: Deserialize + Eq + Hash<Hasher>,
           V: Deserialize,
-          H: Hasher,
 {
     type Value = HashMap<K, V>;
 
     #[inline]
     fn visit_map<
-        Visitor: MapVisitor,
-    >(&mut self, mut visitor: Visitor) -> Result<HashMap<K, V>, Visitor::Error> {
+        V_: MapVisitor,
+    >(&mut self, mut visitor: V_) -> Result<HashMap<K, V>, V_::Error> {
         let (len, _) = visitor.size_hint();
         let mut values = HashMap::with_capacity(len);
 
@@ -618,17 +618,19 @@ impl<K, V, H> Visitor for HashMapVisitor<K, V, H>
     }
 }
 
-impl<
-    K: Deserialize + Eq + Hash,
-    V: Deserialize,
-> Deserialize for HashMap<K, V> {
+impl<K, V> Deserialize for HashMap<K, V>
+    where K: Deserialize + Eq + Hash<Hasher>,
+          V: Deserialize,
+{
     fn deserialize<
-        S: Deserializer,
-    >(state: &mut S) -> Result<HashMap<K, V>, S::Error> {
+        S_: Deserializer,
+    >(state: &mut S_) -> Result<HashMap<K, V>, S_::Error> {
         state.visit(&mut HashMapVisitor)
     }
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
 struct BTreeMapVisitor<K, V>;
 
 impl<K, V> Visitor for BTreeMapVisitor<K, V>