Switch to the new custom_deserialize syntax

tests/test_de.rs

@@ -297,24 +297,20 @@ impl<'a, 'b> de::VariantVisitor for TokenDeserializerVariantVisitor<'a, 'b> {
 
 //////////////////////////////////////////////////////////////////////////
 
-#[derive(Copy, PartialEq, Debug)]
-#[derive_deserialize]
+#[derive(Copy, PartialEq, Debug, Deserialize)]
 struct NamedUnit;
 
-#[derive(PartialEq, Debug)]
-#[derive_deserialize]
+#[derive(PartialEq, Debug, Deserialize)]
 struct NamedSeq(i32, i32, i32);
 
-#[derive(PartialEq, Debug)]
-#[derive_deserialize]
+#[derive(PartialEq, Debug, Deserialize)]
 struct NamedMap {
     a: i32,
     b: i32,
     c: i32,
 }
 
-#[derive(PartialEq, Debug)]
-#[derive_deserialize]
+#[derive(PartialEq, Debug, Deserialize)]
 enum Enum {
     Unit,
     Seq(i32, i32, i32),

tests/test_json.rs

@@ -28,9 +28,7 @@ macro_rules! treemap {
     })
 }
 
-#[derive(Clone, Debug, PartialEq)]
-#[derive_serialize]
-#[derive_deserialize]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 enum Animal {
     Dog,
     Frog(String, Vec<isize>),
@@ -38,18 +36,14 @@ enum Animal {
 
 }
 
-#[derive(Clone, Debug, PartialEq)]
-#[derive_serialize]
-#[derive_deserialize]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 struct Inner {
     a: (),
     b: usize,
     c: Vec<String>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
-#[derive_serialize]
-#[derive_deserialize]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 struct Outer {
     inner: Vec<Inner>,
 }
@@ -903,9 +897,7 @@ fn test_parse_option() {
         ("\"jodhpurs\"", Some("jodhpurs".to_string())),
     ]);
 
-    #[derive(Clone, Debug, PartialEq)]
-    #[derive_serialize]
-    #[derive_deserialize]
+    #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
     struct Foo {
         x: Option<isize>,
     }
@@ -990,8 +982,7 @@ fn test_multiline_errors() {
 
 #[test]
 fn test_missing_field() {
-    #[derive(Debug, PartialEq)]
-    #[derive_deserialize]
+    #[derive(Debug, PartialEq, Deserialize)]
     struct Foo {
         x: Option<u32>,
     }

tests/test_macros.rs

@@ -25,37 +25,30 @@ trait Trait {
 }
 */
 
-#[derive(Debug, PartialEq)]
-#[derive_serialize]
-#[derive_deserialize]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct NamedUnit;
 
-#[derive(Debug, PartialEq)]
-#[derive_serialize]
+#[derive(Debug, PartialEq, Serialize)]
 struct SerNamedTuple<'a, 'b, A: 'a, B: 'b, C>(&'a A, &'b mut B, C);
 
-#[derive(Debug, PartialEq)]
-#[derive_deserialize]
+#[derive(Debug, PartialEq, Deserialize)]
 struct DeNamedTuple<A, B, C>(A, B, C);
 
-#[derive(Debug, PartialEq)]
-#[derive_serialize]
+#[derive(Debug, PartialEq, Serialize)]
 struct SerNamedMap<'a, 'b, A: 'a, B: 'b, C> {
     a: &'a A,
     b: &'b mut B,
     c: C,
 }
 
-#[derive(Debug, PartialEq)]
-#[derive_deserialize]
+#[derive(Debug, PartialEq, Deserialize)]
 struct DeNamedMap<A, B, C> {
     a: A,
     b: B,
     c: C,
 }
 
-#[derive(Debug, PartialEq)]
-#[derive_serialize]
+#[derive(Debug, PartialEq, Serialize)]
 enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
     Unit,
     Seq(
@@ -95,8 +88,7 @@ enum SerEnum<'a, B: 'a, C: /* Trait + */ 'a, D> where D: /* Trait + */ 'a {
     },
 }
 
-#[derive(Debug, PartialEq)]
-#[derive_deserialize]
+#[derive(Debug, PartialEq, Deserialize)]
 enum DeEnum<B, C: /* Trait */, D> /* where D: Trait */ {
     Unit,
     Seq(

tests/test_ser.rs

@@ -267,20 +267,20 @@ impl<'a> Serializer for AssertSerializer<'a> {
 
 //////////////////////////////////////////////////////////////////////////
 
-#[derive_serialize]
+#[derive(Serialize)]
 struct NamedUnit;
 
-#[derive_serialize]
+#[derive(Serialize)]
 struct NamedSeq(i32, i32, i32);
 
-#[derive_serialize]
+#[derive(Serialize)]
 struct NamedMap {
     a: i32,
     b: i32,
     c: i32,
 }
 
-#[derive_serialize]
+#[derive(Serialize)]
 enum Enum {
     Unit,
     Seq(i32, i32),