Skip to content

Commit 9c95426

Browse files
committed
Include variant aliases in error messages
1 parent 85c73ef commit 9c95426

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

serde_derive/src/de.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ fn prepare_enum_variant_enum(variants: &[Variant]) -> (TokenStream, Stmts) {
12591259
});
12601260

12611261
let variants_stmt = {
1262-
let variant_names = variant_names_idents.iter().map(|(name, _, _)| name);
1262+
let variant_names = variant_names_idents.iter().flat_map(|&(_, _, aliases)| aliases);
12631263
quote! {
12641264
#[doc(hidden)]
12651265
const VARIANTS: &'static [&'static str] = &[ #(#variant_names),* ];

test_suite/tests/test_annotations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ fn test_unknown_field_rename_enum() {
782782
variant: "SailorMoon",
783783
len: 3,
784784
}],
785-
"unknown variant `SailorMoon`, expected `sailor_moon`",
785+
"unknown variant `SailorMoon`, expected `sailor_moon` or `usagi_tsukino`",
786786
);
787787

788788
assert_de_tokens_error::<AliasEnum>(

0 commit comments

Comments
 (0)