pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 22:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mingun
2025-09-19 20:38:46 +05:00
parent 896d91f0bb
commit c8184be238
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+8 -9
View File
@@ -951,9 +951,8 @@ enum StructForm<'a> {
/// Contains a variant name and an intermediate deserializer from which actual /// Contains a variant name and an intermediate deserializer from which actual
/// deserialization will be performed /// deserialization will be performed
InternallyTagged(&'a syn::Ident, TokenStream), InternallyTagged(&'a syn::Ident, TokenStream),
/// Contains a variant name and an intermediate deserializer from which actual /// Contains a variant name
/// deserialization will be performed Untagged(&'a syn::Ident),
Untagged(&'a syn::Ident, TokenStream),
} }
/// Generates `Deserialize::deserialize` body for a `struct Struct {...}` /// Generates `Deserialize::deserialize` body for a `struct Struct {...}`
@@ -982,13 +981,13 @@ fn deserialize_struct(
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)
} }
}; };
@@ -1012,7 +1011,7 @@ fn deserialize_struct(
// untagged struct variants do not get a visit_seq method. The same applies to // untagged struct variants do not get a visit_seq method. The same applies to
// structs that only have a map representation. // structs that only have a map representation.
let visit_seq = match form { let visit_seq = match form {
StructForm::Untagged(..) => None, StructForm::Untagged(_) => None,
_ if has_flatten => None, _ if has_flatten => None,
_ => { _ => {
let mut_seq = if deserialized_fields.is_empty() { let mut_seq = if deserialized_fields.is_empty() {
@@ -1097,8 +1096,8 @@ fn deserialize_struct(
StructForm::InternallyTagged(_, deserializer) => quote! { StructForm::InternallyTagged(_, deserializer) => quote! {
_serde::Deserializer::deserialize_any(#deserializer, #visitor_expr) _serde::Deserializer::deserialize_any(#deserializer, #visitor_expr)
}, },
StructForm::Untagged(_, deserializer) => quote! { StructForm::Untagged(_) => quote! {
_serde::Deserializer::deserialize_any(#deserializer, #visitor_expr) _serde::Deserializer::deserialize_any(__deserializer, #visitor_expr)
}, },
}; };
@@ -1931,7 +1930,7 @@ fn deserialize_untagged_variant(
params, params,
&variant.fields, &variant.fields,
cattrs, cattrs,
StructForm::Untagged(variant_ident, quote!(__deserializer)), StructForm::Untagged(variant_ident),
), ),
} }
} }