From f5e0fbcb141b2a111adf3bb16a5f1a4850ed70d3 Mon Sep 17 00:00:00 2001
From: bebecue <bebecue@proton.me>
Date: Sun, 5 Mar 2023 15:14:51 +0800
Subject: [PATCH] Make #[serde(alias)] works in #[serde(flatten)] context

fix #1504
---
 serde_derive/src/de.rs               |  3 ++-
 test_suite/tests/test_annotations.rs | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs
index a703adaf..679086e6 100644
--- a/serde_derive/src/de.rs
+++ b/serde_derive/src/de.rs
@@ -2400,7 +2400,8 @@ fn deserialize_struct_as_struct_visitor(
         .collect();
 
     let fields_stmt = {
-        let field_names = field_names_idents.iter().map(|(name, _, _)| name);
+        let field_names = field_names_idents.iter().flat_map(|(_, _, aliases)| aliases);
+
         quote_block! {
             const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
         }
diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
index f32c22c1..75b7ffdd 100644
--- a/test_suite/tests/test_annotations.rs
+++ b/test_suite/tests/test_annotations.rs
@@ -642,7 +642,7 @@ fn test_unknown_field_rename_struct() {
             Token::Str("a4"),
             Token::I32(3),
         ],
-        "unknown field `a4`, expected one of `a1`, `a2`, `a6`",
+        "unknown field `a4`, expected one of `a1`, `a3`, `a2`, `a5`, `a6`",
     );
 }
 
@@ -780,7 +780,7 @@ fn test_rename_enum() {
             Token::StructVariant {
                 name: "AliasEnum",
                 variant: "sailor_moon",
-                len: 3,
+                len: 5,
             },
             Token::Str("a"),
             Token::I8(0),
@@ -798,7 +798,7 @@ fn test_rename_enum() {
             Token::StructVariant {
                 name: "AliasEnum",
                 variant: "usagi_tsukino",
-                len: 3,
+                len: 5,
             },
             Token::Str("a"),
             Token::I8(0),
@@ -827,7 +827,7 @@ fn test_unknown_field_rename_enum() {
             Token::StructVariant {
                 name: "AliasEnum",
                 variant: "usagi_tsukino",
-                len: 3,
+                len: 5,
             },
             Token::Str("a"),
             Token::I8(0),
@@ -836,7 +836,7 @@ fn test_unknown_field_rename_enum() {
             Token::Str("d"),
             Token::I8(2),
         ],
-        "unknown field `d`, expected one of `a`, `b`, `f`",
+        "unknown field `d`, expected one of `a`, `c`, `b`, `e`, `f`",
     );
 }