From ae665a1c05d4e3e4313b34c50419cfa1ffce9ab0 Mon Sep 17 00:00:00 2001
From: Thomas Bahn <thomas@thomas-bahn.net>
Date: Thu, 1 Jan 2015 14:10:50 +0100
Subject: [PATCH] Syntax extension internals in rust changed

See https://github.com/rust-lang/rust/commit/e656081b700b949bc914fedd6ad29b1ca3197660
---
 serde2/serde2_macros/src/lib.rs | 7 +++----
 serde_macros/src/lib.rs         | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/serde2/serde2_macros/src/lib.rs b/serde2/serde2_macros/src/lib.rs
index 04bf2564..280d6459 100644
--- a/serde2/serde2_macros/src/lib.rs
+++ b/serde2/serde2_macros/src/lib.rs
@@ -80,12 +80,11 @@ fn expand_deriving_serialize<>(cx: &mut ExtCtxt,
                 generics: LifetimeBounds {
                     lifetimes: Vec::new(),
                     bounds: vec![
-                        ("__S", None, vec![]),
-                        ("__R", None, vec![]),
-                        ("__E", None, vec![]),
+                        ("__S", vec![]),
+                        ("__R", vec![]),
+                        ("__E", vec![]),
                         (
                             "__V",
-                            None,
                             vec![
                                 Path::new_(
                                     vec!["serde2", "ser", "Visitor"],
diff --git a/serde_macros/src/lib.rs b/serde_macros/src/lib.rs
index 863dc7a4..a1450d7b 100644
--- a/serde_macros/src/lib.rs
+++ b/serde_macros/src/lib.rs
@@ -83,10 +83,10 @@ fn expand_deriving_serialize(cx: &mut ExtCtxt,
         additional_bounds: Vec::new(),
         generics: LifetimeBounds {
             lifetimes: Vec::new(),
-            bounds: vec!(("__S", None, vec!(Path::new_(
+            bounds: vec!(("__S", vec!(Path::new_(
                             vec!("serde", "ser", "Serializer"), None,
                             vec!(box Literal(Path::new_local("__E"))), true))),
-                         ("__E", None, vec!()))
+                         ("__E", vec!()))
         },
         methods: vec!(
             MethodDef {
@@ -209,10 +209,10 @@ pub fn expand_deriving_deserialize(cx: &mut ExtCtxt,
         additional_bounds: Vec::new(),
         generics: LifetimeBounds {
             lifetimes: Vec::new(),
-            bounds: vec!(("__D", None, vec!(Path::new_(
+            bounds: vec!(("__D", vec!(Path::new_(
                             vec!("serde", "de", "Deserializer"), None,
                             vec!(box Literal(Path::new_local("__E"))), true))),
-                         ("__E", None, vec!()))
+                         ("__E", vec!()))
         },
         methods: vec!(
             MethodDef {