Merge branch 'v0.6.x'

This commit is contained in:
Erick Tryzelaar
2016-02-18 09:46:46 -08:00
6 changed files with 24 additions and 24 deletions
+2 -2
View File
@@ -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(