pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-15 16:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

StructForm::InternallyTagged always instantiated with the same deserializer, so remove that parameter

Browse Source
This commit is contained in:
Mingun
2025-09-19 20:28:22 +05:00
parent c8184be238
commit e04f0ba2de
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+7 -8
View File
@@ -948,9 +948,8 @@ enum StructForm<'a> {
Struct, Struct,
/// Contains a variant name /// Contains a variant name
ExternallyTagged(&'a syn::Ident), ExternallyTagged(&'a syn::Ident),
/// Contains a variant name and an intermediate deserializer from which actual /// Contains a variant name
/// deserialization will be performed InternallyTagged(&'a syn::Ident),
InternallyTagged(&'a syn::Ident, TokenStream),
/// Contains a variant name /// Contains a variant name
Untagged(&'a syn::Ident), Untagged(&'a syn::Ident),
} }
@@ -980,13 +979,13 @@ fn deserialize_struct(
let type_path = match form { let type_path = match form {
StructForm::Struct => construct, StructForm::Struct => construct,
StructForm::ExternallyTagged(variant_ident) StructForm::ExternallyTagged(variant_ident)
| StructForm::InternallyTagged(variant_ident, _) | StructForm::InternallyTagged(variant_ident)
| StructForm::Untagged(variant_ident) => quote!(#construct::#variant_ident), | StructForm::Untagged(variant_ident) => quote!(#construct::#variant_ident),
}; };
let expecting = match form { let expecting = match form {
StructForm::Struct => format!("struct {}", params.type_name()), StructForm::Struct => format!("struct {}", params.type_name()),
StructForm::ExternallyTagged(variant_ident) StructForm::ExternallyTagged(variant_ident)
| StructForm::InternallyTagged(variant_ident, _) | StructForm::InternallyTagged(variant_ident)
| StructForm::Untagged(variant_ident) => { | StructForm::Untagged(variant_ident) => {
format!("struct variant {}::{}", params.type_name(), variant_ident) format!("struct variant {}::{}", params.type_name(), variant_ident)
} }
@@ -1093,8 +1092,8 @@ fn deserialize_struct(
StructForm::ExternallyTagged(_) => quote! { StructForm::ExternallyTagged(_) => quote! {
_serde::de::VariantAccess::struct_variant(__variant, FIELDS, #visitor_expr) _serde::de::VariantAccess::struct_variant(__variant, FIELDS, #visitor_expr)
}, },
StructForm::InternallyTagged(_, deserializer) => quote! { StructForm::InternallyTagged(_) => quote! {
_serde::Deserializer::deserialize_any(#deserializer, #visitor_expr) _serde::Deserializer::deserialize_any(__deserializer, #visitor_expr)
}, },
StructForm::Untagged(_) => quote! { StructForm::Untagged(_) => quote! {
_serde::Deserializer::deserialize_any(__deserializer, #visitor_expr) _serde::Deserializer::deserialize_any(__deserializer, #visitor_expr)
@@ -1878,7 +1877,7 @@ fn deserialize_internally_tagged_variant(
params, params,
&variant.fields, &variant.fields,
cattrs, cattrs,
StructForm::InternallyTagged(variant_ident, quote!(__deserializer)), StructForm::InternallyTagged(variant_ident),
), ),
Style::Tuple => unreachable!("checked in serde_derive_internals"), Style::Tuple => unreachable!("checked in serde_derive_internals"),
} }