Support Serde 0.8. Bump minimum Rust version to 0.15.

3 files changed, 14 insertions, 12 deletions

diff --git a/tests/serde_tests.rs.in b/tests/serde_tests.rs.in
deleted file mode 100644
index 8e04ab0..0000000
--- a/tests/serde_tests.rs.in
+++ /dev/null
@@ -1,4 +0,0 @@
-extern crate serde;
-extern crate plist;
-
-mod serde_;
diff --git a/tests/serde_/mod.rs b/tests/serde_tests/mod.rs
index f48058a..42f9824 100644
--- a/tests/serde_/mod.rs
+++ b/tests/serde_tests/mod.rs
@@ -1,4 +1,5 @@
-use plist::{Deserializer, EventWriter, PlistEvent, Result as PlistResult, Serializer};
+use plist::{EventWriter, PlistEvent, Result as PlistResult};
+use plist::serde::{Serializer, Deserializer};
 use plist::PlistEvent::*;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
@@ -199,11 +200,8 @@ struct NewtypeInner(u8, u8, u8);
 fn newtype_struct() {
     let newtype = NewtypeStruct(NewtypeInner(34, 32, 13));
 
-    let comparison = &[StartArray(Some(3)),
-                       IntegerValue(34),
-                       IntegerValue(32),
-                       IntegerValue(13),
-                       EndArray];
+    let comparison =
+        &[StartArray(Some(3)), IntegerValue(34), IntegerValue(32), IntegerValue(13), EndArray];
 
     assert_roundtrip(newtype, Some(comparison));
 }
diff --git a/tests/tests.rs b/tests/tests.rs
index 0aaf77c..8754b09 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -1,2 +1,10 @@
-#[cfg(feature = "serde_tests")]
-include!(concat!(env!("OUT_DIR"), "/serde_tests.rs"));
+extern crate plist;
+
+#[cfg(feature = "serde")]
+extern crate serde;
+#[cfg(feature = "serde")]
+#[macro_use]
+extern crate serde_derive;
+
+#[cfg(feature = "serde")]
+mod serde_tests;