robin/vdf-reader
1
0
Fork 0
mirror of https://codeberg.org/icewind/vdf-reader.git synced 2026-06-04 02:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

support tagged enums inside tables

Browse source
This commit is contained in:
Robin Appelman 2023-12-21 20:36:09 +01:00
commit 21c048625e
5 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/serde.rs
View file

@ -656,11 +656,15 @@ where
struct Enum<'a, 'de: 'a> {
de: &'a mut Deserializer<'de>,
enclosed: bool,
}
impl<'a, 'de> Enum<'a, 'de> {
fn new(de: &'a mut Deserializer<'de>) -> Self {
Enum { de }
Enum {
de,
enclosed: false,
}
}
}
@ -673,10 +677,19 @@ impl<'de, 'a> EnumAccess<'de> for Enum<'a, 'de> {
type Error = VdfError;
type Variant = Self;
fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant)>
fn variant_seed<V>(mut self, seed: V) -> Result<(V::Value, Self::Variant)>
where
V: DeserializeSeed<'de>,
{
if self
.de
.peek()
.expect_token(&[Token::GroupStart], self.de.source())
.is_ok()
{
self.enclosed = true;
let _ = self.de.next();
}
let val = seed.deserialize(&mut *self.de)?;
Ok((val, self))
}
@ -695,21 +708,39 @@ impl<'de, 'a> VariantAccess<'de> for Enum<'a, 'de> {
where
T: DeserializeSeed<'de>,
{
seed.deserialize(self.de)
let val = seed.deserialize(&mut *self.de)?;
if self.enclosed {
self.de
.next()
.expect_token(&[Token::GroupEnd], self.de.source())?;
}
Ok(val)
}
fn tuple_variant<V>(self, _len: usize, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
de::Deserializer::deserialize_seq(self.de, visitor)
let val = de::Deserializer::deserialize_seq(&mut *self.de, visitor)?;
if self.enclosed {
self.de
.next()
.expect_token(&[Token::GroupEnd], self.de.source())?;
}
Ok(val)
}
fn struct_variant<V>(self, _fields: &'static [&'static str], visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
de::Deserializer::deserialize_map(self.de, visitor)
let val = de::Deserializer::deserialize_map(&mut *self.de, visitor)?;
if self.enclosed {
self.de
.next()
.expect_token(&[Token::GroupEnd], self.de.source())?;
}
Ok(val)
}
}