asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only validate table keys against fields when deserializing enum.

Browse source 
Issue #225
This commit is contained in:
Azriel Hoh 2018-11-17 09:37:02 +13:00
parent 5bcf6f7cb6
commit 752bf0d4a1
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/de.rs
View file

@ -501,14 +501,21 @@ impl<'de> de::Deserializer<'de> for StrDeserializer<'de> {
struct ValueDeserializer<'a> {
value: Value<'a>,
validate_struct_keys: bool,
}
impl<'a> ValueDeserializer<'a> {
fn new(value: Value<'a>) -> ValueDeserializer<'a> {
ValueDeserializer {
value: value,
validate_struct_keys: false,
}
}
fn with_struct_key_validation(mut self) -> Self {
self.validate_struct_keys = true;
self
}
}
impl<'de> de::Deserializer<'de> for ValueDeserializer<'de> {
@ -557,26 +564,28 @@ impl<'de> de::Deserializer<'de> for ValueDeserializer<'de> {
}
}
match &self.value.e {
&E::InlineTable(ref values) | &E::DottedTable(ref values) => {
let extra_fields = values.iter()
.filter_map(|(ref key, ref _val)| {
if !fields.contains(&&(**key)) {
Some(key.clone())
} else {
None
}
})
.collect::<Vec<Cow<'de, str>>>();
if self.validate_struct_keys {
match &self.value.e {
&E::InlineTable(ref values) | &E::DottedTable(ref values) => {
let extra_fields = values.iter()
.filter_map(|(ref key, ref _val)| {
if !fields.contains(&&(**key)) {
Some(key.clone())
} else {
None
}
})
.collect::<Vec<Cow<'de, str>>>();
if !extra_fields.is_empty() {
return Err(Error::from_kind(ErrorKind::UnexpectedKeys {
keys: extra_fields.iter().map(|k| k.to_string()).collect::<Vec<_>>(),
available: fields,
}));
if !extra_fields.is_empty() {
return Err(Error::from_kind(ErrorKind::UnexpectedKeys {
keys: extra_fields.iter().map(|k| k.to_string()).collect::<Vec<_>>(),
available: fields,
}));
}
}
_ => {}
}
_ => {}
}
if name == spanned::NAME && fields == &[spanned::START, spanned::END, spanned::VALUE] {
@ -900,7 +909,7 @@ impl<'de> de::VariantAccess<'de> for TableEnumDeserializer<'de> {
V: de::Visitor<'de>,
{
de::Deserializer::deserialize_struct(
ValueDeserializer::new(self.value),
ValueDeserializer::new(self.value).with_struct_key_validation(),
"", // TODO: this should be the variant name
fields,
visitor,