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

untagged enums

Browse source
This commit is contained in:
Robin Appelman 2023-12-18 18:06:19 +01:00
commit 08e7d35905
5 changed files with 99 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/serde.rs
View file

@ -94,14 +94,36 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
V: Visitor<'de>,
{
let source = self.source();
let peek = self.peek().expect_token(VALUE_TOKEN, source)?;
match peek.token {
Token::Item | Token::QuotedItem | Token::Statement | Token::QuotedStatement => self
.deserialize_str(visitor)
.ensure_span(peek.span, self.source()),
Token::GroupStart => self
.deserialize_map(visitor)
.ensure_span(peek.span, self.source()),
let token = self.next().expect_token(VALUE_TOKEN, source)?;
let span = token.span.clone();
match token.token {
Token::Item | Token::QuotedItem | Token::Statement | Token::QuotedStatement => {
let str = token.string(self.source());
// note: we don't check for bool as we can't distinguish those from numbers
if let Ok(int) = i64::from_str(str.as_ref()) {
return visitor.visit_i64(int).ensure_span(span, self.source());
}
if let Ok(float) = f64::from_str(str.as_ref()) {
return visitor.visit_f64(float).ensure_span(span, self.source());
}
if str.starts_with('[') && str.ends_with(']') {
self.push_peeked(token);
return self
.deserialize_seq(visitor)
.ensure_span(span, self.source());
}
match str {
Cow::Borrowed(str) => visitor
.visit_borrowed_str(str)
.ensure_span(span, self.source()),
Cow::Owned(str) => visitor.visit_string(str).ensure_span(span, self.source()),
}
}
Token::GroupStart => {
self.push_peeked(token);
self.deserialize_map(visitor)
.ensure_span(span, self.source())
}
_ => unreachable!(),
}
}
@ -780,4 +802,17 @@ mod tests {
let expected = E::Struct2 { a: 1 };
assert_eq!(expected, unwrap_err(from_str(j)));
}
#[test]
fn test_untagged_enum() {
#[derive(Deserialize, PartialEq, Debug)]
#[serde(untagged)]
enum E {
Int(u8),
Float(f32),
}
let j = r#"1.1"#;
assert_eq!(E::Float(1.1), unwrap_err(from_str(j)));
}
}