From 099d7b66836bc994b26e78b4066f28f32b82ffe9 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 24 Apr 2017 21:48:02 +0900 Subject: Allow to deserialize/serialize into enums Close #164 --- src/value.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/value.rs') diff --git a/src/value.rs b/src/value.rs index 7c2b3eb..f499ff6 100644 --- a/src/value.rs +++ b/src/value.rs @@ -694,7 +694,7 @@ impl ser::Serializer for Serializer { _variant_index: u32, _variant: &'static str) -> Result { - Err(::ser::Error::UnsupportedType) + self.serialize_str(_variant) } fn serialize_newtype_struct(self, -- cgit v1.2.3 From 45acd4f5b592536f013b94084faca41b42e48c13 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 25 Apr 2017 13:57:35 +0900 Subject: Deserialize enum in Value --- src/value.rs | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) (limited to 'src/value.rs') diff --git a/src/value.rs b/src/value.rs index f499ff6..ebb14fc 100644 --- a/src/value.rs +++ b/src/value.rs @@ -8,6 +8,7 @@ use std::vec; use serde::ser; use serde::de; +use serde::de::IntoDeserializer; pub use datetime::{Datetime, DatetimeParseError}; use datetime::{DatetimeFromString, SERDE_STRUCT_FIELD_NAME}; @@ -505,6 +506,31 @@ impl<'de> de::Deserializer<'de> for Value { } } + #[inline] + fn deserialize_enum( + self, + _name: &str, + _variants: &'static [&'static str], + visitor: V, + ) -> Result + where + V: de::Visitor<'de>, + { + let (variant, value) = match self { + Value::String(variant) => (variant, None), + _ => { + return Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"string only"),); + } + }; + + visitor.visit_enum( + EnumDeserializer { + variant: variant, + value: value, + }, + ) +} + // `None` is interpreted as a missing field so be sure to implement `Some` // as a present field. fn deserialize_option(self, visitor: V) -> Result @@ -516,10 +542,69 @@ impl<'de> de::Deserializer<'de> for Value { forward_to_deserialize_any! { bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string unit seq bytes byte_buf map unit_struct tuple_struct struct - tuple ignored_any enum newtype_struct identifier + tuple ignored_any newtype_struct identifier + } +} +struct EnumDeserializer { + variant: String, + value: Option, +} + +impl<'de> de::EnumAccess<'de> for EnumDeserializer { + type Error = ::de::Error; + type Variant = VariantDeserializer; + + fn variant_seed(self, seed: V) -> Result<(V::Value, VariantDeserializer), Self::Error> + where + V: de::DeserializeSeed<'de>, + { + let variant = self.variant.into_deserializer(); + let visitor = VariantDeserializer { value: self.value }; + seed.deserialize(variant).map(|v| (v, visitor)) } } +struct VariantDeserializer { + value: Option, +} + +impl<'de> de::VariantAccess<'de> for VariantDeserializer { + type Error = ::de::Error; + + fn unit_variant(self) -> Result<(), Self::Error> { + match self.value { + Some(value) => de::Deserialize::deserialize(value), + None => Ok(()), + } + } + + fn newtype_variant_seed(self, _: T) -> Result + where + T: de::DeserializeSeed<'de>, + { + Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"newtype variant")) + } + + fn tuple_variant(self, _len: usize, _: V) -> Result + where + V: de::Visitor<'de>, + { + Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"tuple variant")) + } + + fn struct_variant( + self, + _fields: &'static [&'static str], + _: V, + ) -> Result + where + V: de::Visitor<'de>, + { + Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"struct variant")) + } +} + + struct SeqDeserializer { iter: vec::IntoIter, } -- cgit v1.2.3 From 082ee7090212e8a377b2145fe82712cc41431fee Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Fri, 28 Apr 2017 13:00:37 +0900 Subject: Address comment and make test pass --- src/value.rs | 78 ++++-------------------------------------------------------- 1 file changed, 5 insertions(+), 73 deletions(-) (limited to 'src/value.rs') diff --git a/src/value.rs b/src/value.rs index ebb14fc..dcc3567 100644 --- a/src/value.rs +++ b/src/value.rs @@ -516,20 +516,11 @@ impl<'de> de::Deserializer<'de> for Value { where V: de::Visitor<'de>, { - let (variant, value) = match self { - Value::String(variant) => (variant, None), - _ => { - return Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"string only"),); - } - }; - - visitor.visit_enum( - EnumDeserializer { - variant: variant, - value: value, - }, - ) -} + match self { + Value::String(variant) => visitor.visit_enum(variant.into_deserializer()), + _ => Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"string only")), + } + } // `None` is interpreted as a missing field so be sure to implement `Some` // as a present field. @@ -545,65 +536,6 @@ impl<'de> de::Deserializer<'de> for Value { tuple ignored_any newtype_struct identifier } } -struct EnumDeserializer { - variant: String, - value: Option, -} - -impl<'de> de::EnumAccess<'de> for EnumDeserializer { - type Error = ::de::Error; - type Variant = VariantDeserializer; - - fn variant_seed(self, seed: V) -> Result<(V::Value, VariantDeserializer), Self::Error> - where - V: de::DeserializeSeed<'de>, - { - let variant = self.variant.into_deserializer(); - let visitor = VariantDeserializer { value: self.value }; - seed.deserialize(variant).map(|v| (v, visitor)) - } -} - -struct VariantDeserializer { - value: Option, -} - -impl<'de> de::VariantAccess<'de> for VariantDeserializer { - type Error = ::de::Error; - - fn unit_variant(self) -> Result<(), Self::Error> { - match self.value { - Some(value) => de::Deserialize::deserialize(value), - None => Ok(()), - } - } - - fn newtype_variant_seed(self, _: T) -> Result - where - T: de::DeserializeSeed<'de>, - { - Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"newtype variant")) - } - - fn tuple_variant(self, _len: usize, _: V) -> Result - where - V: de::Visitor<'de>, - { - Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"tuple variant")) - } - - fn struct_variant( - self, - _fields: &'static [&'static str], - _: V, - ) -> Result - where - V: de::Visitor<'de>, - { - Err(de::Error::invalid_type(de::Unexpected::UnitVariant, &"struct variant")) - } -} - struct SeqDeserializer { iter: vec::IntoIter, -- cgit v1.2.3