Merge pull request #68 from dtolnay/up

Update to serde 0.8.0

Author: pczarn

Cargo.toml

@@ -21,5 +21,5 @@ serde_impl = ["serde", "serde_test"]
 
 [dependencies]
 clippy = { version = "0.*", optional = true }
-serde = { version = "^0.7", optional = true }
-serde_test = { version = "^0.7", optional = true }
+serde = { version = "^0.8", optional = true }
+serde_test = { version = "^0.8", optional = true }

src/serde.rs

@@ -15,7 +15,6 @@ use std::hash::{BuildHasher, Hash};
 use super::LinkedHashMap;
 
 use self::serde::{Serialize, Serializer, Deserialize, Deserializer};
-use self::serde::ser::impls::MapIteratorVisitor;
 use self::serde::de::{Visitor, MapVisitor, Error};
 
 impl<K, V, S> Serialize for LinkedHashMap<K, V, S>
@@ -27,7 +26,12 @@ impl<K, V, S> Serialize for LinkedHashMap<K, V, S>
     fn serialize<T>(&self, serializer: &mut T) -> Result<(), T::Error>
         where T: Serializer,
     {
-        serializer.serialize_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
+        let mut state = try!(serializer.serialize_map(Some(self.len())));
+        for (k, v) in self {
+            try!(serializer.serialize_map_key(&mut state, k));
+            try!(serializer.serialize_map_value(&mut state, v));
+        }
+        serializer.serialize_map_end(state)
     }
 }