mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Skip collecting unmatched fields in variants that do not use flatten

Browse Source
This commit is contained in:
David Tolnay 2024-08-07 18:43:47 -07:00
parent d64a97ba1e
commit 32958dec3b
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
serde_derive/src/de.rs
View File

@ -2480,7 +2480,10 @@ 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 has_flatten = fields
.iter()
.any(|field| field.attrs.flatten() && !field.attrs.skip_deserializing());
let let_collect = if has_flatten {
Some(quote! { Some(quote! {
let mut __collect = _serde::__private::Vec::<_serde::__private::Option<( let mut __collect = _serde::__private::Vec::<_serde::__private::Option<(
_serde::__private::de::Content, _serde::__private::de::Content,
@ -2532,7 +2535,7 @@ fn deserialize_map(
}); });
// Visit ignored values to consume them // Visit ignored values to consume them
let ignored_arm = if cattrs.has_flatten() { let ignored_arm = if has_flatten {
Some(quote! { Some(quote! {
__Field::__other(__name) => { __Field::__other(__name) => {
__collect.push(_serde::__private::Some(( __collect.push(_serde::__private::Some((
@ -2602,7 +2605,7 @@ fn deserialize_map(
} }
}); });
let collected_deny_unknown_fields = if cattrs.has_flatten() && cattrs.deny_unknown_fields() { let collected_deny_unknown_fields = if has_flatten && cattrs.deny_unknown_fields() {
Some(quote! { Some(quote! {
if let _serde::__private::Some(_serde::__private::Some((__key, _))) = if let _serde::__private::Some(_serde::__private::Some((__key, _))) =
__collect.into_iter().filter(_serde::__private::Option::is_some).next() __collect.into_iter().filter(_serde::__private::Option::is_some).next()