Remove Serializer from name of private type that is not a Serializer

This commit is contained in:
David Tolnay
2023-08-01 22:06:49 -07:00
parent 110bf10481
commit 5cdd82d41e
2 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -1356,15 +1356,15 @@ where
} }
} }
pub struct AdjacentlyTaggedEnumVariantSerializer { pub struct AdjacentlyTaggedEnumVariant {
tag: &'static str, tag: &'static str,
variant_index: u32, variant_index: u32,
variant_name: &'static str, variant_name: &'static str,
} }
impl AdjacentlyTaggedEnumVariantSerializer { impl AdjacentlyTaggedEnumVariant {
pub fn new(tag: &'static str, variant_index: u32, variant_name: &'static str) -> Self { pub fn new(tag: &'static str, variant_index: u32, variant_name: &'static str) -> Self {
AdjacentlyTaggedEnumVariantSerializer { AdjacentlyTaggedEnumVariant {
tag, tag,
variant_index, variant_index,
variant_name, variant_name,
@@ -1372,7 +1372,7 @@ impl AdjacentlyTaggedEnumVariantSerializer {
} }
} }
impl Serialize for AdjacentlyTaggedEnumVariantSerializer { impl Serialize for AdjacentlyTaggedEnumVariant {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
S: Serializer, S: Serializer,
+4 -4
View File
@@ -648,7 +648,7 @@ fn serialize_adjacently_tagged_variant(
let this_type = &params.this_type; let this_type = &params.this_type;
let type_name = cattrs.name().serialize_name(); let type_name = cattrs.name().serialize_name();
let variant_name = variant.attrs.name().serialize_name(); let variant_name = variant.attrs.name().serialize_name();
let variant_serializer = quote!(&_serde::__private::ser::AdjacentlyTaggedEnumVariantSerializer::new(#tag, #variant_index, #variant_name)); let variant = quote!(&_serde::__private::ser::AdjacentlyTaggedEnumVariant::new(#tag, #variant_index, #variant_name));
let inner = Stmts(if let Some(path) = variant.attrs.serialize_with() { let inner = Stmts(if let Some(path) = variant.attrs.serialize_with() {
let ser = wrap_serialize_variant_with(params, path, variant); let ser = wrap_serialize_variant_with(params, path, variant);
@@ -662,7 +662,7 @@ fn serialize_adjacently_tagged_variant(
let mut __struct = _serde::Serializer::serialize_struct( let mut __struct = _serde::Serializer::serialize_struct(
__serializer, #type_name, 1)?; __serializer, #type_name, 1)?;
_serde::ser::SerializeStruct::serialize_field( _serde::ser::SerializeStruct::serialize_field(
&mut __struct, #tag, #variant_serializer)?; &mut __struct, #tag, #variant)?;
_serde::ser::SerializeStruct::end(__struct) _serde::ser::SerializeStruct::end(__struct)
}; };
} }
@@ -679,7 +679,7 @@ fn serialize_adjacently_tagged_variant(
let mut __struct = _serde::Serializer::serialize_struct( let mut __struct = _serde::Serializer::serialize_struct(
__serializer, #type_name, 2)?; __serializer, #type_name, 2)?;
_serde::ser::SerializeStruct::serialize_field( _serde::ser::SerializeStruct::serialize_field(
&mut __struct, #tag, #variant_serializer)?; &mut __struct, #tag, #variant)?;
#func( #func(
&mut __struct, #content, #field_expr)?; &mut __struct, #content, #field_expr)?;
_serde::ser::SerializeStruct::end(__struct) _serde::ser::SerializeStruct::end(__struct)
@@ -744,7 +744,7 @@ fn serialize_adjacently_tagged_variant(
let mut __struct = _serde::Serializer::serialize_struct( let mut __struct = _serde::Serializer::serialize_struct(
__serializer, #type_name, 2)?; __serializer, #type_name, 2)?;
_serde::ser::SerializeStruct::serialize_field( _serde::ser::SerializeStruct::serialize_field(
&mut __struct, #tag, #variant_serializer)?; &mut __struct, #tag, #variant)?;
_serde::ser::SerializeStruct::serialize_field( _serde::ser::SerializeStruct::serialize_field(
&mut __struct, #content, &__AdjacentlyTagged { &mut __struct, #content, &__AdjacentlyTagged {
data: (#(#fields_ident,)*), data: (#(#fields_ident,)*),