From 3b5d71fbb57e3350041f82a174221e3be9a4515b Mon Sep 17 00:00:00 2001
From: Thomas Bahn <thomas@thomas-bahn.net>
Date: Fri, 6 Feb 2015 13:32:17 +0100
Subject: [PATCH] Add empty `associated_types` in `expand_derive`

---
 serde2/serde2_macros/src/lib.rs | 4 +++-
 serde_macros/src/lib.rs         | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/serde2/serde2_macros/src/lib.rs b/serde2/serde2_macros/src/lib.rs
index 1de7a4c2..7ea7ce24 100644
--- a/serde2/serde2_macros/src/lib.rs
+++ b/serde2/serde2_macros/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(plugin_registrar, quote, unboxed_closures)]
+#![feature(plugin_registrar, quote, unboxed_closures, rustc_private)]
 
 extern crate syntax;
 extern crate rustc;
@@ -73,6 +73,7 @@ fn expand_derive_serialize<>(cx: &mut ExtCtxt,
         path: Path::new(vec!["serde2", "ser", "Serialize"]),
         additional_bounds: Vec::new(),
         generics: LifetimeBounds::empty(),
+        associated_types: vec![],
         methods: vec![
             MethodDef {
                 name: "visit",
@@ -260,6 +261,7 @@ pub fn expand_derive_deserialize(cx: &mut ExtCtxt,
                             vec!(Box::new(Literal(Path::new_local("__E")))), true))),
                          ("__E", None, vec!()))
         },
+        associated_types: vec![],
         methods: vec!(
             MethodDef {
                 name: "deserialize_token",
diff --git a/serde_macros/src/lib.rs b/serde_macros/src/lib.rs
index cc322185..86892efa 100644
--- a/serde_macros/src/lib.rs
+++ b/serde_macros/src/lib.rs
@@ -1,7 +1,7 @@
 #![crate_name = "serde_macros"]
 #![crate_type = "dylib"]
 
-#![feature(plugin_registrar, quote, unboxed_closures)]
+#![feature(plugin_registrar, quote, unboxed_closures, rustc_private)]
 
 extern crate syntax;
 extern crate rustc;
@@ -110,7 +110,8 @@ fn expand_derive_serialize(cx: &mut ExtCtxt,
                 combine_substructure: combine_substructure(Box::new( |a, b, c| {
                     serialize_substructure(a, b, c, item)
                 })),
-            })
+            }),
+        associated_types: vec!()
     };
 
     trait_def.expand(cx, mitem, item, |item| push.call_mut((item,)))
@@ -241,7 +242,8 @@ pub fn expand_derive_deserialize(cx: &mut ExtCtxt,
                 combine_substructure: combine_substructure(Box::new(|a, b, c| {
                     deserialize_substructure(a, b, c)
                 })),
-            })
+            }),
+        associated_types: vec!()
     };
 
     trait_def.expand(cx, mitem, item, |item| push.call_mut((item,)))