From 206e19edb40a8e3df29fc8d3862d92b02176f3dc Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sat, 2 May 2015 10:44:57 -0700 Subject: [PATCH] Fix unquoting arms with latest quasi --- Cargo.toml | 7 ++----- serde_macros/Cargo.toml | 2 +- serde_macros/src/de.rs | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d44fd131..9269fd92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde" -version = "0.3.2" +version = "0.3.3" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" @@ -14,7 +14,4 @@ num = "*" [dev-dependencies] rustc-serialize = "*" - -[dev-dependencies.serde_macros] -path = "serde_macros/" -version = "0.3.2" +serde_macros = { version = "*", path = "serde_macros" } diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 19afc20e..dfa53b38 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_macros" -version = "0.3.2" +version = "0.3.3" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" diff --git a/serde_macros/src/de.rs b/serde_macros/src/de.rs index 14716bf0..66fe052b 100644 --- a/serde_macros/src/de.rs +++ b/serde_macros/src/de.rs @@ -361,8 +361,8 @@ fn deserialize_item_enum( let variant_arms: Vec<_> = enum_def.variants.iter() .enumerate() .map(|(i, variant)| { - let variant_name = builder.expr().path() - .id("__Field").id(format!("__field{}", i)) + let variant_name = builder.pat().enum_() + .id("__Field").id(format!("__field{}", i)).build() .build(); let expr = deserialize_variant(