itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-09-27 13:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #[derive_serialize] for enum struct variants

Browse Source
This commit is contained in:
Erick Tryzelaar 2015-03-03 21:17:40 -08:00
parent fe64145c06
commit 7a170e1b2c
2 changed files with 3 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serde2/serde2_macros/src/lib.rs
View File

@ -443,8 +443,8 @@ fn serialize_variant(
ast::StructVariantKind(ref struct_def) => {
(
cx.ident_of("SeqVisitor"),
cx.ident_of("visit_enum_seq"),
cx.ident_of("MapVisitor"),
cx.ident_of("visit_enum_map"),
struct_def.fields.iter()
.map(|field| field.node.ty.clone())
.collect()

87
serde2/tests/test_ser.rs
View File

@ -287,98 +287,13 @@ struct NamedUnit;
#[derive_serialize]
struct NamedSeq(i32, i32, i32);
#[derive_serialize]
enum Enum {
Unit,
Seq(i32, i32),
Map { a: i32, b: i32 },
}
impl Serialize for Enum {
fn visit<V>(&self, visitor: &mut V) -> Result<V::Value, V::Error>
where V: Visitor,
{
match *self {
Enum::Unit => {
visitor.visit_enum_unit("Enum", "Unit")
}
Enum::Seq(ref a, ref b) => {
visitor.visit_enum_seq("Enum", "Seq", EnumSeqVisitor {
a: a,
b: b,
state: 0,
})
}
Enum::Map { ref a, ref b } => {
visitor.visit_enum_map("Enum", "Map", EnumMapVisitor {
a: a,
b: b,
state: 0,
})
}
}
}
}
struct EnumSeqVisitor<'a> {
a: &'a i32,
b: &'a i32,
state: u8,
}
impl<'a> SeqVisitor for EnumSeqVisitor<'a> {
fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
where V: Visitor,
{
match self.state {
0 => {
self.state += 1;
Ok(Some(try!(visitor.visit_seq_elt(true, self.a))))
}
1 => {
self.state += 1;
Ok(Some(try!(visitor.visit_seq_elt(false, self.b))))
}
_ => {
Ok(None)
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
(2, Some(2))
}
}
struct EnumMapVisitor<'a> {
a: &'a i32,
b: &'a i32,
state: u8,
}
impl<'a> MapVisitor for EnumMapVisitor<'a> {
fn visit<V>(&mut self, visitor: &mut V) -> Result<Option<V::Value>, V::Error>
where V: Visitor,
{
match self.state {
0 => {
self.state += 1;
Ok(Some(try!(visitor.visit_map_elt(true, "a", self.a))))
}
1 => {
self.state += 1;
Ok(Some(try!(visitor.visit_map_elt(false, "b", self.b))))
}
_ => {
Ok(None)
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
(2, Some(2))
}
}
macro_rules! btreemap {
() => {
BTreeMap::new()