Revert "Support deserialization of struct keys from integers"

This is not as useful as expected because the Serializer does not know the real
index of each struct field being serialized. The best it can do is keep a
counter, which goes wrong if fields are conditionally skipped.

This reverts commit eec7101894.

serde_derive/src/de.rs

@@ -1386,21 +1386,26 @@ fn deserialize_identifier(
         "field identifier"
     };
 
-    let variant_indices = 0u32..;
+    let visit_index = if is_variant {
-    let fallthrough_msg = format!("variant index 0 <= i < {}", fields.len());
+        let variant_indices = 0u32..;
-    let visit_index = quote! {
+        let fallthrough_msg = format!("variant index 0 <= i < {}", fields.len());
-        fn visit_u32<__E>(self, __value: u32) -> _serde::export::Result<Self::Value, __E>
+        let visit_index = quote! {
-            where __E: _serde::de::Error
+            fn visit_u32<__E>(self, __value: u32) -> _serde::export::Result<Self::Value, __E>
-        {
+                where __E: _serde::de::Error
-            match __value {
+            {
-                #(
+                match __value {
-                    #variant_indices => _serde::export::Ok(#constructors),
+                    #(
-                )*
+                        #variant_indices => _serde::export::Ok(#constructors),
-                _ => _serde::export::Err(_serde::de::Error::invalid_value(
+                    )*
-                            _serde::de::Unexpected::Unsigned(__value as u64),
+                    _ => _serde::export::Err(_serde::de::Error::invalid_value(
-                            &#fallthrough_msg))
+                                _serde::de::Unexpected::Unsigned(__value as u64),
+                                &#fallthrough_msg))
+                }
             }
-        }
+        };
+        Some(visit_index)
+    } else {
+        None
     };
 
     let bytes_to_str = if fallthrough.is_some() {

test_suite/tests/test_de.rs

@@ -605,17 +605,6 @@ declare_tests! {
             Token::StructEnd,
         ],
     }
-    test_struct_integer_keys {
-        Struct { a: 1, b: 2, c: 0 } => &[
-            Token::Struct { name: "Struct", len: 2 },
-                Token::U32(0),
-                Token::I32(1),
-
-                Token::U32(1),
-                Token::I32(2),
-            Token::StructEnd,
-        ],
-    }
     test_enum_unit {
         Enum::Unit => &[
             Token::UnitVariant { name: "Enum", variant: "Unit" },