itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 23:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed various issues with combinding flatten and deny_unknown_fields

Browse Source
This commit is contained in:
Jan Michael Auer 2018-03-15 16:17:54 +01:00 committed by Armin Ronacher
parent 6627540dd6
commit 5457394f5b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/src/de/mod.rs
View File

@ -258,7 +258,7 @@ macro_rules! declare_error_trait {
/// Raised when a `Deserialize` struct type recieved a field with an /// Raised when a `Deserialize` struct type recieved a field with an
/// unrecognized name but the names are not actually known because of /// unrecognized name but the names are not actually known because of
/// flattening. /// flattening.
fn unknow_field_in_flattened_structure(field: &str) -> Self { fn unknown_field_in_flattened_structure(field: &str) -> Self {
Error::custom(format_args!("unknown field `{}`", field)) Error::custom(format_args!("unknown field `{}`", field))
} }

18
serde_derive/src/de.rs
View File

@ -1709,12 +1709,12 @@ fn deserialize_generated_identifier(
let this = quote!(__Field); let this = quote!(__Field);
let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident)| ident).collect(); let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident)| ident).collect();
let (ignore_variant, fallthrough, want_value) = if is_variant || cattrs.deny_unknown_fields() { let (ignore_variant, fallthrough, want_value) = if cattrs.has_flatten() {
(None, None, false)
} else if cattrs.has_flatten() {
let ignore_variant = quote!(__other(String),); let ignore_variant = quote!(__other(String),);
let fallthrough = quote!(_serde::export::Ok(__Field::__other(__value.to_string()))); let fallthrough = quote!(_serde::export::Ok(__Field::__other(__value.to_string())));
(Some(ignore_variant), Some(fallthrough), true) (Some(ignore_variant), Some(fallthrough), true)
} else if is_variant || cattrs.deny_unknown_fields() {
(None, None, false)
} else { } else {
let ignore_variant = quote!(__ignore,); let ignore_variant = quote!(__ignore,);
let fallthrough = quote!(_serde::export::Ok(__Field::__ignore)); let fallthrough = quote!(_serde::export::Ok(__Field::__ignore));
@ -2026,7 +2026,7 @@ fn deserialize_map(
// Collect contents for flatten fields into a buffer // Collect contents for flatten fields into a buffer
let let_collect = if cattrs.has_flatten() { let let_collect = if cattrs.has_flatten() {
Some(quote! { Some(quote! {
let mut __collect = Vec::<_serde::private::de::Content>::new(); let mut __collect = Vec::<(String, _serde::private::de::Content)>::new();
}) })
} else { } else {
None None
@ -2067,14 +2067,14 @@ fn deserialize_map(
}); });
// Visit ignored values to consume them // Visit ignored values to consume them
let ignored_arm = if cattrs.deny_unknown_fields() { let ignored_arm = if cattrs.has_flatten() {
None
} else if cattrs.has_flatten() {
Some(quote! { Some(quote! {
__Field::__other(__name) => { __Field::__other(__name) => {
__collect.push((__name, try!(_serde::de::MapAccess::next_value(&mut __map)))); __collect.push((__name, try!(_serde::de::MapAccess::next_value(&mut __map))));
} }
}) })
} else if cattrs.deny_unknown_fields() {
None
} else { } else {
Some(quote! { Some(quote! {
_ => { let _ = try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map)); } _ => { let _ = try!(_serde::de::MapAccess::next_value::<_serde::de::IgnoredAny>(&mut __map)); }
@ -2128,11 +2128,11 @@ fn deserialize_map(
} }
}); });
let collected_deny_unknown_fields = if cattrs.deny_unknown_fields() { let collected_deny_unknown_fields = if cattrs.has_flatten() && cattrs.deny_unknown_fields() {
Some(quote! { Some(quote! {
if let Some((__key, _)) = __collect.into_iter().next() { if let Some((__key, _)) = __collect.into_iter().next() {
return _serde::export::Err( return _serde::export::Err(
_serde::de::Error::unknown_field_in_flattened_structure(__key)); _serde::de::Error::unknown_field_in_flattened_structure(&__key));
} }
}) })
} else { } else {