Merge branch 'v0.6.x'

# Conflicts:
#	serde/src/de/impls.rs
#	serde_codegen/src/de.rs
This commit is contained in:
Erick Tryzelaar
2016-01-28 09:49:15 -08:00
5 changed files with 29 additions and 2 deletions
+1 -1
View File
@@ -949,7 +949,7 @@ fn deserialize_field_visitor(
}
}
deserializer.deserialize(__FieldVisitor::<D>{ phantom: PhantomData })
deserializer.deserialize_struct_key(__FieldVisitor::<D>{ phantom: PhantomData })
}
}
).unwrap();