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

Eliminate duplicated borrowed and non-borrowed identifier deserialization

Browse Source
This commit is contained in:
David Tolnay 2021-01-23 20:21:39 -08:00
parent 3f48ed36cc
commit 3728d3c67a
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
serde_derive/src/de.rs
View File

@ -1904,23 +1904,17 @@ fn deserialize_generated_identifier(
let (ignore_variant, fallthrough) = if !is_variant && cattrs.has_flatten() { let (ignore_variant, fallthrough) = if !is_variant && cattrs.has_flatten() {
let ignore_variant = quote!(__other(_serde::__private::de::Content<'de>),); let ignore_variant = quote!(__other(_serde::__private::de::Content<'de>),);
let fallthrough = quote!(_serde::__private::Ok(__Field::__other(__value))); let fallthrough = quote!(_serde::__private::Ok(__Field::__other(__value)));
( (Some(ignore_variant), Some(fallthrough))
Some(ignore_variant),
Some((fallthrough.clone(), fallthrough)),
)
} else if let Some(other_idx) = other_idx { } else if let Some(other_idx) = other_idx {
let ignore_variant = fields[other_idx].1.clone(); let ignore_variant = fields[other_idx].1.clone();
let fallthrough = quote!(_serde::__private::Ok(__Field::#ignore_variant)); let fallthrough = quote!(_serde::__private::Ok(__Field::#ignore_variant));
(None, Some((fallthrough.clone(), fallthrough))) (None, Some(fallthrough))
} else if is_variant || cattrs.deny_unknown_fields() { } else if is_variant || cattrs.deny_unknown_fields() {
(None, None) (None, None)
} else { } else {
let ignore_variant = quote!(__ignore,); let ignore_variant = quote!(__ignore,);
let fallthrough = quote!(_serde::__private::Ok(__Field::__ignore)); let fallthrough = quote!(_serde::__private::Ok(__Field::__ignore));
( (Some(ignore_variant), Some(fallthrough))
Some(ignore_variant),
Some((fallthrough.clone(), fallthrough)),
)
}; };
let visitor_impl = Stmts(deserialize_identifier( let visitor_impl = Stmts(deserialize_identifier(
@ -1928,6 +1922,7 @@ fn deserialize_generated_identifier(
fields, fields,
is_variant, is_variant,
fallthrough, fallthrough,
None,
!is_variant && cattrs.has_flatten(), !is_variant && cattrs.has_flatten(),
None, None,
)); ));
@ -1981,7 +1976,7 @@ fn deserialize_custom_identifier(
let this = &params.this; let this = &params.this;
let this = quote!(#this); let this = quote!(#this);
let (ordinary, fallthrough) = if let Some(last) = variants.last() { let (ordinary, fallthrough, fallthrough_borrowed) = if let Some(last) = variants.last() {
let last_ident = &last.ident; let last_ident = &last.ident;
if last.attrs.other() { if last.attrs.other() {
// Process `serde(other)` attribute. It would always be found on the // Process `serde(other)` attribute. It would always be found on the
@ -1989,7 +1984,7 @@ fn deserialize_custom_identifier(
// are ordinary variants. // are ordinary variants.
let ordinary = &variants[..variants.len() - 1]; let ordinary = &variants[..variants.len() - 1];
let fallthrough = quote!(_serde::__private::Ok(#this::#last_ident)); let fallthrough = quote!(_serde::__private::Ok(#this::#last_ident));
(ordinary, Some((fallthrough.clone(), fallthrough))) (ordinary, Some(fallthrough), None)
} else if let Style::Newtype = last.style { } else if let Style::Newtype = last.style {
let ordinary = &variants[..variants.len() - 1]; let ordinary = &variants[..variants.len() - 1];
let fallthrough = |value| { let fallthrough = |value| {
@ -2003,16 +1998,16 @@ fn deserialize_custom_identifier(
}; };
( (
ordinary, ordinary,
Some(( Some(fallthrough(quote!(__value))),
fallthrough(quote!(__value)), Some(fallthrough(quote!(_serde::__private::de::Borrowed(
fallthrough(quote!(_serde::__private::de::Borrowed(__value))), __value
)), )))),
) )
} else { } else {
(variants, None) (variants, None, None)
} }
} else { } else {
(variants, None) (variants, None, None)
}; };
let names_idents: Vec<_> = ordinary let names_idents: Vec<_> = ordinary
@ -2050,6 +2045,7 @@ fn deserialize_custom_identifier(
&names_idents, &names_idents,
is_variant, is_variant,
fallthrough, fallthrough,
fallthrough_borrowed,
false, false,
cattrs.expecting(), cattrs.expecting(),
)); ));
@ -2080,8 +2076,8 @@ fn deserialize_identifier(
this: &TokenStream, this: &TokenStream,
fields: &[(String, Ident, Vec<String>)], fields: &[(String, Ident, Vec<String>)],
is_variant: bool, is_variant: bool,
// .0 for referenced data, .1 -- for borrowed fallthrough: Option<TokenStream>,
fallthrough: Option<(TokenStream, TokenStream)>, fallthrough_borrowed: Option<TokenStream>,
collect_other_fields: bool, collect_other_fields: bool,
expecting: Option<&str>, expecting: Option<&str>,
) -> Fragment { ) -> Fragment {
@ -2145,22 +2141,19 @@ fn deserialize_identifier(
(None, None, None, None) (None, None, None, None)
}; };
let (fallthrough_arm, fallthrough_borrowed_arm) = if let Some(fallthrough) = fallthrough.clone() let fallthrough_arm = if let Some(fallthrough) = fallthrough.clone() {
{
fallthrough fallthrough
} else if is_variant { } else if is_variant {
let fallthrough = quote! { quote! {
_serde::__private::Err(_serde::de::Error::unknown_variant(__value, VARIANTS)) _serde::__private::Err(_serde::de::Error::unknown_variant(__value, VARIANTS))
}; }
(fallthrough.clone(), fallthrough)
} else { } else {
let fallthrough = quote! { quote! {
_serde::__private::Err(_serde::de::Error::unknown_field(__value, FIELDS)) _serde::__private::Err(_serde::de::Error::unknown_field(__value, FIELDS))
}; }
(fallthrough.clone(), fallthrough)
}; };
let u64_fallthrough_arm = if let Some((fallthrough, _)) = fallthrough { let u64_fallthrough_arm = if let Some(fallthrough) = fallthrough {
fallthrough fallthrough
} else { } else {
let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len()); let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len());
@ -2282,6 +2275,44 @@ fn deserialize_identifier(
} }
}; };
let visit_borrowed = if fallthrough_borrowed.is_some() || collect_other_fields {
let fallthrough_borrowed_arm = fallthrough_borrowed.as_ref().unwrap_or(&fallthrough_arm);
Some(quote! {
fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::__private::Result<Self::Value, __E>
where
__E: _serde::de::Error,
{
match __value {
#(
#field_strs => _serde::__private::Ok(#constructors),
)*
_ => {
#value_as_borrowed_str_content
#fallthrough_borrowed_arm
}
}
}
fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::__private::Result<Self::Value, __E>
where
__E: _serde::de::Error,
{
match __value {
#(
#field_bytes => _serde::__private::Ok(#constructors),
)*
_ => {
#bytes_to_str
#value_as_borrowed_bytes_content
#fallthrough_borrowed_arm
}
}
}
})
} else {
None
};
quote_block! { quote_block! {
fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result { fn expecting(&self, __formatter: &mut _serde::__private::Formatter) -> _serde::__private::fmt::Result {
_serde::__private::Formatter::write_str(__formatter, #expecting) _serde::__private::Formatter::write_str(__formatter, #expecting)
@ -2304,21 +2335,6 @@ fn deserialize_identifier(
} }
} }
fn visit_borrowed_str<__E>(self, __value: &'de str) -> _serde::__private::Result<Self::Value, __E>
where
__E: _serde::de::Error,
{
match __value {
#(
#field_strs => _serde::__private::Ok(#constructors),
)*
_ => {
#value_as_borrowed_str_content
#fallthrough_borrowed_arm
}
}
}
fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::__private::Result<Self::Value, __E> fn visit_bytes<__E>(self, __value: &[u8]) -> _serde::__private::Result<Self::Value, __E>
where where
__E: _serde::de::Error, __E: _serde::de::Error,
@ -2335,21 +2351,7 @@ fn deserialize_identifier(
} }
} }
fn visit_borrowed_bytes<__E>(self, __value: &'de [u8]) -> _serde::__private::Result<Self::Value, __E> #visit_borrowed
where
__E: _serde::de::Error,
{
match __value {
#(
#field_bytes => _serde::__private::Ok(#constructors),
)*
_ => {
#bytes_to_str
#value_as_borrowed_bytes_content
#fallthrough_borrowed_arm
}
}
}
} }
} }