Replace rustc-serialize with base64 crate.

2 files changed, 5 insertions, 8 deletions

diff --git a/src/xml/reader.rs b/src/xml/reader.rs
index 00b3bc4..4a236fa 100644
--- a/src/xml/reader.rs
+++ b/src/xml/reader.rs
@@ -1,4 +1,4 @@
-use rustc_serialize::base64::FromBase64;
+use base64;
 use std::io::Read;
 use std::str::FromStr;
 use xml_rs::reader::{EventReader as XmlEventReader, ParserConfig, XmlEvent};
@@ -66,11 +66,8 @@ impl<R: Read> EventReader<R> {
                         "false" => return Some(Ok(PlistEvent::BooleanValue(false))),
                         "data" => {
                             return Some(self.read_content(|s| {
-                                let s: String = s.replace(" ", "").replace("\t", "");
-                                match FromBase64::from_base64(&s[..]) {
-                                    Ok(b) => Ok(PlistEvent::DataValue(b)),
-                                    Err(_) => Err(Error::InvalidData),
-                                }
+                                let data = base64::decode_ws(&s).map_err(|_| Error::InvalidData)?;
+                                Ok(PlistEvent::DataValue(data))
                             }))
                         }
                         "date" => {
diff --git a/src/xml/writer.rs b/src/xml/writer.rs
index 02c57db..a3bfb53 100644
--- a/src/xml/writer.rs
+++ b/src/xml/writer.rs
@@ -1,4 +1,4 @@
-use rustc_serialize::base64::{MIME, ToBase64};
+use base64;
 use std::borrow::Cow;
 use std::io::Write;
 use xml_rs::attribute::Attribute;
@@ -162,7 +162,7 @@ impl<W: Write> PlistEventWriter for EventWriter<W> {
                 try!(self.end_element("false"));
             }
             PlistEvent::DataValue(ref value) => {
-                let base64_data = value.to_base64(MIME);
+                let base64_data = base64::encode(&value);
                 try!(self.write_element_and_value("data", &base64_data));
             }
             PlistEvent::DateValue(ref value) => {