From b8787a29a3a8d4bdeedecccbd2ab3a9b386f7683 Mon Sep 17 00:00:00 2001
From: Edward Barnard
Date: Sat, 7 Jan 2017 10:53:37 +0000
Subject: Support Serde 0.8. Bump minimum Rust version to 0.15.

---
 src/lib.rs | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index e63e18e..c3ef24b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -38,38 +38,26 @@
 extern crate byteorder;
 extern crate chrono;
 extern crate rustc_serialize;
-extern crate serde;
 extern crate xml as xml_rs;
 
 pub mod binary;
 pub mod xml;
 
 mod builder;
-mod de;
-mod ser;
 
-pub use de::Deserializer;
-pub use ser::Serializer;
+// Optional serde module
+#[cfg(feature = "serde")]
+#[macro_use]
+extern crate serde as serde_base;
+#[cfg(feature = "serde")]
+pub mod serde;
 
 use chrono::{DateTime, UTC};
-use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::fmt;
-use std::io::{Read, Seek, SeekFrom, Write};
+use std::io::{Read, Seek, SeekFrom};
 use std::io::Error as IoError;
 
-pub fn deserialize<R: Read + Seek, T: Deserialize>(reader: R) -> Result<T> {
-    let reader = EventReader::new(reader);
-    let mut de = Deserializer::new(reader);
-    Deserialize::deserialize(&mut de)
-}
-
-pub fn serialize_to_xml<W: Write, T: Serialize>(writer: W, value: &T) -> Result<()> {
-    let writer = xml::EventWriter::new(writer);
-    let mut ser = Serializer::new(writer);
-    value.serialize(&mut ser)
-}
-
 #[derive(Clone, Debug, PartialEq)]
 pub enum Plist {
     Array(Vec<Plist>),
-- 
cgit v1.2.3