From 5941f1d071157923203a278c16fbaddec4077932 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Wed, 22 Jun 2016 20:19:47 -0700
Subject: [PATCH] Version bump the syntex stack

---
 serde_codegen/Cargo.toml | 18 +++++++++---------
 serde_codegen/src/lib.rs |  4 +---
 serde_item/Cargo.toml    |  4 ++--
 serde_macros/Cargo.toml  |  6 +++---
 serde_tests/Cargo.toml   |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml
index ad469496..e068c198 100644
--- a/serde_codegen/Cargo.toml
+++ b/serde_codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_codegen"
-version = "0.7.10"
+version = "0.7.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
@@ -24,14 +24,14 @@ with-syntex = [
 ]
 
 [build-dependencies]
-quasi_codegen = { version = "^0.12.0", optional = true }
-syntex = { version = "^0.33.0", optional = true }
+quasi_codegen = { version = "^0.13.0", optional = true }
+syntex = { version = "^0.36.0", optional = true }
 
 [dependencies]
-aster = { version = "^0.18.0", default-features = false }
+aster = { version = "^0.19.0", default-features = false }
 clippy = { version = "^0.*", optional = true }
-quasi = { version = "^0.12.0", default-features = false }
-quasi_macros = { version = "^0.12.0", optional = true }
-serde_item = { version = "0.1", path = "../serde_item", default-features = false }
-syntex = { version = "^0.35.0", optional = true }
-syntex_syntax = { version = "^0.35.0", optional = true }
+quasi = { version = "^0.13.0", default-features = false }
+quasi_macros = { version = "^0.13.0", optional = true }
+serde_item = { version = "^0.2.0", path = "../serde_item", default-features = false }
+syntex = { version = "^0.36.0", optional = true }
+syntex_syntax = { version = "^0.36.0", optional = true }
diff --git a/serde_codegen/src/lib.rs b/serde_codegen/src/lib.rs
index 0d69c94a..881d9cc2 100644
--- a/serde_codegen/src/lib.rs
+++ b/serde_codegen/src/lib.rs
@@ -23,8 +23,6 @@ extern crate syntax;
 #[cfg(not(feature = "with-syntex"))]
 extern crate rustc_plugin;
 
-#[cfg(feature = "with-syntex")]
-use std::io;
 #[cfg(feature = "with-syntex")]
 use std::path::Path;
 
@@ -38,7 +36,7 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 include!("lib.rs.in");
 
 #[cfg(feature = "with-syntex")]
-pub fn expand<S, D>(src: S, dst: D) -> io::Result<()>
+pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
     where S: AsRef<Path>,
           D: AsRef<Path>,
 {
diff --git a/serde_item/Cargo.toml b/serde_item/Cargo.toml
index 3f88d65d..cce2640a 100644
--- a/serde_item/Cargo.toml
+++ b/serde_item/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_item"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "AST representation used by Serde codegen. Unstable."
@@ -16,4 +16,4 @@ with-syntex = ["syntex_syntax"]
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-syntex_syntax = { version = "^0.35.0", optional = true }
+syntex_syntax = { version = "^0.36.0", optional = true }
diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml
index eb52a3ad..90e5435a 100644
--- a/serde_macros/Cargo.toml
+++ b/serde_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_macros"
-version = "0.7.10"
+version = "0.7.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros to auto-generate implementations for the serde framework"
@@ -18,10 +18,10 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-serde_codegen = { version = "^0.7.10", path = "../serde_codegen", default-features = false, features = ["nightly"] }
+serde_codegen = { version = "^0.7.11", path = "../serde_codegen", default-features = false, features = ["nightly"] }
 
 [dev-dependencies]
-compiletest_rs = "^0.1.1"
+compiletest_rs = "^0.2.0"
 fnv = "1.0"
 rustc-serialize = "^0.3.16"
 serde = { version = "^0.7.10", path = "../serde" }
diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml
index 56d9c031..2f28417a 100644
--- a/serde_tests/Cargo.toml
+++ b/serde_tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "serde_tests"
-version = "0.7.10"
+version = "0.7.11"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"