Improve "expecting" message of adjacently tagged enum variant

This commit is contained in:
David Tolnay
2023-08-01 22:43:26 -07:00
parent 9bd52ec5c1
commit ef4f860384
6 changed files with 36 additions and 35 deletions
+3 -2
View File
@@ -1460,7 +1460,8 @@ fn deserialize_adjacently_tagged_enum(
})
.collect();
let expecting = format!("adjacently tagged enum {}", params.type_name());
let rust_name = params.type_name();
let expecting = format!("adjacently tagged enum {}", rust_name);
let expecting = cattrs.expecting().unwrap_or(&expecting);
let type_name = cattrs.name().deserialize_name();
let deny_unknown_fields = cattrs.deny_unknown_fields();
@@ -1482,7 +1483,7 @@ fn deserialize_adjacently_tagged_enum(
let variant_seed = quote! {
_serde::__private::de::AdjacentlyTaggedEnumVariantSeed::<__Field> {
tag: #tag,
enum_name: #rust_name,
variants: &VARIANTS,
fields_enum: _serde::__private::PhantomData
}
+1 -1
View File
@@ -650,7 +650,7 @@ fn serialize_adjacently_tagged_variant(
let variant_name = variant.attrs.name().serialize_name();
let serialize_variant = quote! {
&_serde::__private::ser::AdjacentlyTaggedEnumVariant {
tag: #tag,
enum_name: #type_name,
variant_index: #variant_index,
variant_name: #variant_name,
}