Merge pull request rust-lang#87 from Mingun/into-deserializer

Implement IntoDeserializer for IndexMap/IndexSet

Author: cuviper

README.rst

@@ -116,6 +116,8 @@ Recent Changes
   - Implemented ``Debug`` for ``map::{Entry, IntoIter, Iter, Keys, Values}`` and
     ``set::{Difference, Intersection, IntoIter, Iter, SymmetricDifference, Union}``
 
+  - Serde trait ``IntoDeserializer`` are implemented for ``IndexMap`` and ``IndexSet``.
+
 - 1.0.2
 
   - The new methods ``IndexMap::insert_full`` and ``IndexSet::insert_full`` are

src/serde.rs

@@ -2,7 +2,8 @@
 extern crate serde;
 
 use self::serde::ser::{Serialize, Serializer, SerializeMap, SerializeSeq};
-use self::serde::de::{Deserialize, Deserializer, MapAccess, SeqAccess, Visitor};
+use self::serde::de::{Deserialize, Deserializer, Error, IntoDeserializer, MapAccess, SeqAccess, Visitor};
+use self::serde::de::value::{MapDeserializer, SeqDeserializer};
 
 use std::fmt::{self, Formatter};
 use std::hash::{BuildHasher, Hash};
@@ -66,6 +67,19 @@ impl<'de, K, V, S> Deserialize<'de> for IndexMap<K, V, S>
     }
 }
 
+impl<'de, K, V, S, E> IntoDeserializer<'de, E> for IndexMap<K, V, S>
+    where K: IntoDeserializer<'de, E> + Eq + Hash,
+          V: IntoDeserializer<'de, E>,
+          S: BuildHasher,
+          E: Error,
+{
+    type Deserializer = MapDeserializer<'de, <Self as IntoIterator>::IntoIter, E>;
+
+    fn into_deserializer(self) -> Self::Deserializer {
+        MapDeserializer::new(self.into_iter())
+    }
+}
+
 
 use IndexSet;
 
@@ -121,3 +135,15 @@ impl<'de, T, S> Deserialize<'de> for IndexSet<T, S>
         deserializer.deserialize_seq(OrderSetVisitor(PhantomData))
     }
 }
+
+impl<'de, T, S, E> IntoDeserializer<'de, E> for IndexSet<T, S>
+    where T: IntoDeserializer<'de, E> + Eq + Hash,
+          S: BuildHasher,
+          E: Error,
+{
+    type Deserializer = SeqDeserializer<<Self as IntoIterator>::IntoIter, E>;
+
+    fn into_deserializer(self) -> Self::Deserializer {
+        SeqDeserializer::new(self.into_iter())
+    }
+}