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

fix unit enum parse

Browse source
This commit is contained in:
Robin Appelman 2023-12-21 19:51:49 +01:00
commit 988672437c
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/serde.rs
View file

@ -436,7 +436,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
.visit_enum(Enum::new(self))
.map_err(|e| match (variant_token, &e) {
(Some(variant_token), VdfError::UnknownVariant(_)) => {
e.with_source_span(variant_token.span, self.source())
e.with_source_span(variant_token.span.start..self.last_span.end, self.source())
}
_ => e,
})
@ -662,10 +662,6 @@ impl<'a, 'de> Enum<'a, 'de> {
fn new(de: &'a mut Deserializer<'de>) -> Self {
Enum { de }
}
fn source(&self) -> &'de str {
self.de.source()
}
}
// `EnumAccess` is provided to the `Visitor` to give it the ability to determine
@ -692,12 +688,6 @@ impl<'de, 'a> VariantAccess<'de> for Enum<'a, 'de> {
type Error = VdfError;
fn unit_variant(self) -> Result<()> {
let (str, span) = self.de.read_str()?;
if !str.is_empty() {
return Err(SerdeParseError::new("unit", str.as_ref(), span, self.source()).into());
}
Ok(())
}