Merge branch origin/master into origin/stack

This commit is contained in:
David Tolnay
2016-08-18 15:26:14 -04:00
9 changed files with 29 additions and 29 deletions
+10 -10
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.8.1"
version = "0.8.2"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
@@ -13,7 +13,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
[features]
default = ["with-syntex"]
unstable = ["quasi_macros"]
unstable-testing = ["clippy"]
unstable-testing = []
with-syntex = [
"quasi/with-syntex",
"quasi_codegen",
@@ -24,14 +24,14 @@ with-syntex = [
]
[build-dependencies]
quasi_codegen = { version = "^0.16.0", optional = true }
syntex = { version = "^0.39.0", optional = true }
quasi_codegen = { version = "^0.17.0", optional = true }
syntex = { version = "^0.41.0", optional = true }
[dependencies]
aster = { version = "^0.22.0", default-features = false }
aster = { version = "^0.24.0", default-features = false }
clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.16.0", default-features = false }
quasi_macros = { version = "^0.16.0", optional = true }
serde_codegen_internals = { version = "=0.5.0", default-features = false, path = "../serde_codegen_internals" }
syntex = { version = "^0.39.0", optional = true }
syntex_syntax = { version = "^0.39.0", optional = true }
quasi = { version = "^0.17.0", default-features = false }
quasi_macros = { version = "^0.17.0", optional = true }
serde_codegen_internals = { version = "=0.6.0", default-features = false, path = "../serde_codegen_internals" }
syntex = { version = "^0.41.0", optional = true }
syntex_syntax = { version = "^0.41.0", optional = true }