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

better spans for group value errors

Browse source
This commit is contained in:
Robin Appelman 2023-12-18 21:50:00 +01:00
commit b999ea2e75
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/serde.rs
View file

@ -13,6 +13,7 @@ pub struct Deserializer<'de> {
tokenizer: Tokenizer<'de>, tokenizer: Tokenizer<'de>,
peeked: Option<Result<SpannedToken, Span>>, peeked: Option<Result<SpannedToken, Span>>,
last_key: Cow<'de, str>, last_key: Cow<'de, str>,
last_span: Span,
} }
const STRING_ITEMS: &[Token] = &[ const STRING_ITEMS: &[Token] = &[
@ -28,6 +29,7 @@ impl<'de> Deserializer<'de> {
tokenizer: Tokenizer::from_str(input), tokenizer: Tokenizer::from_str(input),
peeked: None, peeked: None,
last_key: "".into(), last_key: "".into(),
last_span: 0..0,
} }
} }
@ -36,7 +38,19 @@ impl<'de> Deserializer<'de> {
} }
pub fn next(&mut self) -> Option<Result<SpannedToken, Span>> { pub fn next(&mut self) -> Option<Result<SpannedToken, Span>> {
self.peeked.take().or_else(|| self.tokenizer.next()) self.peeked
.take()
.or_else(|| self.tokenizer.next())
.map(|r| {
r.map(|t| {
self.last_span = t.span.clone();
t
})
.map_err(|span| {
self.last_span = span.clone();
span
})
})
} }
pub fn peek(&mut self) -> Option<Result<SpannedToken, Span>> { pub fn peek(&mut self) -> Option<Result<SpannedToken, Span>> {
@ -513,9 +527,10 @@ impl<'de, 'a> MapAccess<'de> for TableWalker<'de, 'a> {
where where
V: DeserializeSeed<'de>, V: DeserializeSeed<'de>,
{ {
if let Some(span) = self.de.peek_span() { if let Some(start_span) = self.de.peek_span() {
seed.deserialize(&mut *self.de) let res = seed.deserialize(&mut *self.de);
.ensure_span(span, self.source()) let span = start_span.start..self.de.last_span.end;
res.ensure_span(span, self.source())
} else { } else {
seed.deserialize(&mut *self.de) seed.deserialize(&mut *self.de)
} }