diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 981088af..6df7b238 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -312,14 +312,14 @@ fn deserialize_body(cont: &Container, params: &Parameters) -> Fragment { deserialize_try_from(type_try_from) } else if let attr::Identifier::No = cont.attrs.identifier() { match &cont.data { - Data::Enum(variants) => enum_::generate_body(params, variants, &cont.attrs), + Data::Enum(variants) => enum_::deserialize(params, variants, &cont.attrs), Data::Struct(Style::Struct, fields) => { - struct_::generate_body(params, fields, &cont.attrs, StructForm::Struct) + struct_::deserialize(params, fields, &cont.attrs, StructForm::Struct) } Data::Struct(Style::Tuple, fields) | Data::Struct(Style::Newtype, fields) => { - tuple::generate_body(params, fields, &cont.attrs, TupleForm::Tuple) + tuple::deserialize(params, fields, &cont.attrs, TupleForm::Tuple) } - Data::Struct(Style::Unit, _) => unit::generate_body(params, &cont.attrs), + Data::Struct(Style::Unit, _) => unit::deserialize(params, &cont.attrs), } } else { match &cont.data { diff --git a/serde_derive/src/de/enum_.rs b/serde_derive/src/de/enum_.rs index 39ffc359..6f5094ff 100644 --- a/serde_derive/src/de/enum_.rs +++ b/serde_derive/src/de/enum_.rs @@ -12,7 +12,7 @@ use proc_macro2::TokenStream; use quote::quote; /// Generates `Deserialize::deserialize` body for an `enum Enum {...}` -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, variants: &[Variant], cattrs: &attr::Container, @@ -30,7 +30,7 @@ pub(super) fn generate_body( return _serde::#private::Ok(__ok); } }; - enum_untagged::generate_body(params, untagged, cattrs, Some(first_attempt)) + enum_untagged::deserialize(params, untagged, cattrs, Some(first_attempt)) } None => deserialize_homogeneous_enum(params, variants, cattrs), } @@ -42,14 +42,14 @@ fn deserialize_homogeneous_enum( cattrs: &attr::Container, ) -> Fragment { match cattrs.tag() { - attr::TagType::External => enum_externally::generate_body(params, variants, cattrs), + attr::TagType::External => enum_externally::deserialize(params, variants, cattrs), attr::TagType::Internal { tag } => { - enum_internally::generate_body(params, variants, cattrs, tag) + enum_internally::deserialize(params, variants, cattrs, tag) } attr::TagType::Adjacent { tag, content } => { - enum_adjacently::generate_body(params, variants, cattrs, tag, content) + enum_adjacently::deserialize(params, variants, cattrs, tag, content) } - attr::TagType::None => enum_untagged::generate_body(params, variants, cattrs, None), + attr::TagType::None => enum_untagged::deserialize(params, variants, cattrs, None), } } diff --git a/serde_derive/src/de/enum_adjacently.rs b/serde_derive/src/de/enum_adjacently.rs index 7b07c188..58ed47b7 100644 --- a/serde_derive/src/de/enum_adjacently.rs +++ b/serde_derive/src/de/enum_adjacently.rs @@ -16,7 +16,7 @@ use quote::{quote, quote_spanned}; use syn::spanned::Spanned; /// Generates `Deserialize::deserialize` body for an `enum Enum {...}` with `#[serde(tag, content)]` attributes -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, variants: &[Variant], cattrs: &attr::Container, diff --git a/serde_derive/src/de/enum_externally.rs b/serde_derive/src/de/enum_externally.rs index ec79b97b..9e5bde3d 100644 --- a/serde_derive/src/de/enum_externally.rs +++ b/serde_derive/src/de/enum_externally.rs @@ -20,7 +20,7 @@ use quote::{quote, quote_spanned}; use syn::spanned::Spanned; /// Generates `Deserialize::deserialize` body for an `enum Enum {...}` without additional attributes -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, variants: &[Variant], cattrs: &attr::Container, @@ -144,13 +144,13 @@ fn deserialize_externally_tagged_variant( &variant.fields[0], cattrs, ), - Style::Tuple => tuple::generate_body( + Style::Tuple => tuple::deserialize( params, &variant.fields, cattrs, TupleForm::ExternallyTagged(variant_ident), ), - Style::Struct => struct_::generate_body( + Style::Struct => struct_::deserialize( params, &variant.fields, cattrs, diff --git a/serde_derive/src/de/enum_internally.rs b/serde_derive/src/de/enum_internally.rs index 8566080a..30905f50 100644 --- a/serde_derive/src/de/enum_internally.rs +++ b/serde_derive/src/de/enum_internally.rs @@ -18,7 +18,7 @@ use crate::private; use quote::quote; /// Generates `Deserialize::deserialize` body for an `enum Enum {...}` with `#[serde(tag)]` attribute -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, variants: &[Variant], cattrs: &attr::Container, @@ -95,7 +95,7 @@ fn deserialize_internally_tagged_variant( Style::Newtype => { enum_untagged::generate_newtype_variant(variant_ident, params, &variant.fields[0]) } - Style::Struct => struct_::generate_body( + Style::Struct => struct_::deserialize( params, &variant.fields, cattrs, diff --git a/serde_derive/src/de/enum_untagged.rs b/serde_derive/src/de/enum_untagged.rs index b65e045c..5a0fb178 100644 --- a/serde_derive/src/de/enum_untagged.rs +++ b/serde_derive/src/de/enum_untagged.rs @@ -19,7 +19,7 @@ use quote::{quote, quote_spanned}; use syn::spanned::Spanned; /// Generates `Deserialize::deserialize` body for an `enum Enum {...}` with `#[serde(untagged)]` attribute -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, variants: &[Variant], cattrs: &attr::Container, @@ -93,13 +93,13 @@ pub(super) fn generate_variant( } } Style::Newtype => generate_newtype_variant(variant_ident, params, &variant.fields[0]), - Style::Tuple => tuple::generate_body( + Style::Tuple => tuple::deserialize( params, &variant.fields, cattrs, TupleForm::Untagged(variant_ident), ), - Style::Struct => struct_::generate_body( + Style::Struct => struct_::deserialize( params, &variant.fields, cattrs, diff --git a/serde_derive/src/de/struct_.rs b/serde_derive/src/de/struct_.rs index f5a77ecf..8465ae5b 100644 --- a/serde_derive/src/de/struct_.rs +++ b/serde_derive/src/de/struct_.rs @@ -14,7 +14,7 @@ use quote::{quote, quote_spanned}; use syn::spanned::Spanned; /// Generates `Deserialize::deserialize` body for a `struct Struct {...}` -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, fields: &[Field], cattrs: &attr::Container, diff --git a/serde_derive/src/de/tuple.rs b/serde_derive/src/de/tuple.rs index 9db0b373..ee231171 100644 --- a/serde_derive/src/de/tuple.rs +++ b/serde_derive/src/de/tuple.rs @@ -10,7 +10,7 @@ use quote::{quote, quote_spanned}; use syn::spanned::Spanned; /// Generates `Deserialize::deserialize` body for a `struct Tuple(...);` including `struct Newtype(T);` -pub(super) fn generate_body( +pub(super) fn deserialize( params: &Parameters, fields: &[Field], cattrs: &attr::Container, diff --git a/serde_derive/src/de/unit.rs b/serde_derive/src/de/unit.rs index 1eef24c4..0d15ef4d 100644 --- a/serde_derive/src/de/unit.rs +++ b/serde_derive/src/de/unit.rs @@ -5,7 +5,7 @@ use crate::private; use quote::quote; /// Generates `Deserialize::deserialize` body for a `struct Unit;` -pub(super) fn generate_body(params: &Parameters, cattrs: &attr::Container) -> Fragment { +pub(super) fn deserialize(params: &Parameters, cattrs: &attr::Container) -> Fragment { let this_type = ¶ms.this_type; let this_value = ¶ms.this_value; let type_name = cattrs.name().deserialize_name();