mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'v0.6.x'

Browse Source
This commit is contained in:
Erick Tryzelaar 2015-11-02 20:39:32 -08:00
commit f474c57881
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serde_codegen/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.6.1"
version = "0.6.2"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
@ -15,12 +15,12 @@ nightly = ["quasi_macros"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies]
quasi_codegen = { verision = "^0.3.4", optional = true }
syntex = { version = "^0.18.0", optional = true }
quasi_codegen = { verision = "^0.3.6", optional = true }
syntex = { version = "^0.17.0", optional = true }
[dependencies]
aster = { version = "^0.5.0", default-features = false }
aster = { version = "^0.6.0", default-features = false }
quasi = { verision = "^0.3.5", default-features = false }
quasi_macros = { version = "^0.3.5", optional = true }
syntex = { version = "^0.17.0", optional = true }
syntex_syntax = { version = "^0.18.0", optional = true }
syntex_syntax = { version = "^0.19.1", optional = true }

2
serde_codegen/src/de.rs
View File

@ -622,7 +622,7 @@ fn deserialize_variant(
) -> P<ast::Expr> {
let variant_ident = variant.node.name;
match *variant.node.data {
match variant.node.data {
ast::VariantData::Unit(_) => {
quote_expr!(cx, {
try!(visitor.visit_unit());

2
serde_codegen/src/ser.rs
View File

@ -292,7 +292,7 @@ fn serialize_variant(
let variant_ident = variant.node.name;
let variant_name = builder.expr().str(variant_ident);
match *variant.node.data {
match variant.node.data {
ast::VariantData::Unit(_) => {
let pat = builder.pat().enum_()
.id(type_ident).id(variant_ident).build()

12
serde_tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "serde_tests"
version = "0.5.0"
version = "0.6.2"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"
@ -11,15 +11,15 @@ keywords = ["serialization"]
build = "build.rs"
[build-dependencies]
syntex = { version = "*" }
syntex_syntax = { version = "*" }
syntex = { version = "^0.17.0" }
syntex_syntax = { version = "^0.19.1" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies]
num = "*"
rustc-serialize = "*"
num = "^0.1.27"
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
syntex = "*"
syntex = "^0.17.0"
[[test]]
name = "test"