diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 0879175a..f280d692 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde" -version = "0.6.13" +version = "0.6.14" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" @@ -17,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"] num-rational = ["num/rational"] [dependencies] -clippy = { version = "^0.0.41", optional = true } +clippy = { version = "^0.*", optional = true } num = { version = "^0.1.27", default-features = false } diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 21d7c1b4..2814c5dd 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen" -version = "0.6.13" +version = "0.6.14" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -16,13 +16,13 @@ nightly-testing = ["clippy"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] [build-dependencies] -quasi_codegen = { version = "^0.6.0", optional = true } -syntex = { version = "^0.28.0", optional = true } +quasi_codegen = { version = "^0.7.0", optional = true } +syntex = { version = "^0.29.0", optional = true } [dependencies] -aster = { version = "^0.12.0", default-features = false } -clippy = { version = "^0.0.41", optional = true } -quasi = { version = "^0.6.0", default-features = false } -quasi_macros = { version = "^0.6.0", optional = true } -syntex = { version = "^0.28.0", optional = true } -syntex_syntax = { version = "^0.28.0", optional = true } +aster = { version = "^0.13.1", default-features = false } +clippy = { version = "^0.*", optional = true } +quasi = { version = "^0.7.0", default-features = false } +quasi_macros = { version = "^0.7.0", optional = true } +syntex = { version = "^0.29.0", optional = true } +syntex_syntax = { version = "^0.29.0", optional = true } diff --git a/serde_codegen/src/de.rs b/serde_codegen/src/de.rs index d835f5e5..298c856d 100644 --- a/serde_codegen/src/de.rs +++ b/serde_codegen/src/de.rs @@ -587,8 +587,8 @@ fn deserialize_item_enum( // Match arms to extract a variant from a string let mut variant_arms = vec![]; for (i, variant) in enum_def.variants.iter().enumerate() { - let variant_name = builder.pat().enum_() - .id("__Field").id(format!("__field{}", i)).build() + let variant_name = builder.pat().path() + .id("__Field").id(format!("__field{}", i)) .build(); let expr = try!(deserialize_variant( diff --git a/serde_codegen/src/ser.rs b/serde_codegen/src/ser.rs index 6884b9e4..ab59071a 100644 --- a/serde_codegen/src/ser.rs +++ b/serde_codegen/src/ser.rs @@ -314,8 +314,8 @@ fn serialize_variant( match variant.node.data { ast::VariantData::Unit(_) => { - let pat = builder.pat().enum_() - .id(type_ident).id(variant_ident).build() + let pat = builder.pat().path() + .id(type_ident).id(variant_ident) .build(); Ok(quote_arm!(cx, diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 7203cd87..23e15383 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_macros" -version = "0.6.13" +version = "0.6.14" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -16,14 +16,14 @@ plugin = true nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [dependencies] -clippy = { version = "^0.0.41", optional = true } -serde_codegen = { version = "^0.6.13", path = "../serde_codegen", default-features = false, features = ["nightly"] } +clippy = { version = "^0.*", optional = true } +serde_codegen = { version = "^0.6.14", path = "../serde_codegen", default-features = false, features = ["nightly"] } [dev-dependencies] compiletest_rs = "^0.0.11" num = "^0.1.27" rustc-serialize = "^0.3.16" -serde = { version = "^0.6.13", path = "../serde", features = ["num-impls"] } +serde = { version = "^0.6.14", path = "../serde", features = ["num-impls"] } [[test]] name = "test" diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml index a4ed74d9..51ee24f8 100644 --- a/serde_tests/Cargo.toml +++ b/serde_tests/Cargo.toml @@ -14,18 +14,18 @@ build = "build.rs" nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [build-dependencies] -syntex = { version = "^0.28.0" } -syntex_syntax = { version = "^0.28.0" } -serde_codegen = { version = "^0.6.13", path = "../serde_codegen", features = ["with-syntex"] } +syntex = { version = "^0.29.0" } +syntex_syntax = { version = "^0.29.0" } +serde_codegen = { version = "^0.6.14", path = "../serde_codegen", features = ["with-syntex"] } [dev-dependencies] num = "^0.1.26" rustc-serialize = "^0.3.16" serde = { version = "*", path = "../serde", features = ["num-impls"] } -syntex = "^0.28.0" +syntex = "^0.29.0" [dependencies] -clippy = { version = "^0.0.41", optional = true } +clippy = { version = "^0.*", optional = true } [[test]] name = "test"