direct deserializer hint

Author: nickbabcock

jomini_derive/src/lib.rs

@@ -407,6 +407,16 @@ pub fn derive(input: TokenStream) -> TokenStream {
         }
     });
 
+    let deser_request = if named_fields.named.iter().find_map(binary_token).is_some() {
+        quote! {
+            ::serde::Deserializer::deserialize_u16(__deserializer, __FieldVisitor)
+        }
+    } else {
+        quote! {
+            ::serde::Deserializer::deserialize_identifier(__deserializer, __FieldVisitor)
+        }
+    };
+
     let expecting = format!("struct {}", struct_ident);
     let struct_ident_str = struct_ident.to_string();
 
@@ -475,7 +485,7 @@ pub fn derive(input: TokenStream) -> TokenStream {
                     where
                         __D: ::serde::Deserializer<'de>,
                     {
-                        ::serde::Deserializer::deserialize_identifier(__deserializer, __FieldVisitor)
+                        #deser_request
                     }
                 }
 

src/binary/de.rs

@@ -423,7 +423,6 @@ where
             s => match self.de.config.resolver.resolve(s) {
                 Some(id) => visitor.visit_borrowed_str(id),
                 None => match self.de.config.failed_resolve_strategy {
-                    FailedResolveStrategy::Visit => visitor.visit_u16(s),
                     FailedResolveStrategy::Error => Err(Error::from(DeserializeError {
                         kind: DeserializeErrorKind::UnknownToken { token_id: s },
                     })),
@@ -457,7 +456,6 @@ impl<'a, 'de: 'a, 'res: 'de, RES: TokenResolver, F: BinaryFlavor> de::Deserializ
     deserialize_scalar!(deserialize_i8);
     deserialize_scalar!(deserialize_i16);
     deserialize_scalar!(deserialize_u8);
-    deserialize_scalar!(deserialize_u16);
     deserialize_scalar!(deserialize_char);
     deserialize_scalar!(deserialize_identifier);
     deserialize_scalar!(deserialize_bytes);
@@ -474,6 +472,17 @@ impl<'a, 'de: 'a, 'res: 'de, RES: TokenResolver, F: BinaryFlavor> de::Deserializ
         }
     }
 
+    fn deserialize_u16<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        match self.token {
+            QUOTED_STRING | UNQUOTED_STRING | U32 | I32 | U64 | I64 | BOOL | F32 | F64 | OPEN
+            | END | EQUAL => self.deser(visitor),
+            x => visitor.visit_u16(x),
+        }
+    }
+
     fn deserialize_i32<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: Visitor<'de>,
@@ -1143,7 +1152,6 @@ fn visit_key<'b, 'de: 'b, 'res: 'de, RES: TokenResolver, F: BinaryFlavor, V: Vis
         BinaryToken::Token(s) => match config.resolver.resolve(s) {
             Some(id) => visitor.visit_borrowed_str(id),
             None => match config.failed_resolve_strategy {
-                FailedResolveStrategy::Visit => visitor.visit_u16(s),
                 FailedResolveStrategy::Error => Err(Error::from(DeserializeError {
                     kind: DeserializeErrorKind::UnknownToken { token_id: s },
                 })),
@@ -1161,6 +1169,17 @@ impl<'b, 'de, 'res: 'de, RES: TokenResolver, E: BinaryFlavor> de::Deserializer<'
 {
     type Error = Error;
 
+    fn deserialize_u16<V>(self, visitor: V) -> Result<V::Value, Self::Error>
+    where
+        V: Visitor<'de>,
+    {
+        if let BinaryToken::Token(x) = self.tokens[self.tape_idx] {
+            visitor.visit_u16(x)
+        } else {
+            visit_key(self.tape_idx, self.tokens, self.config, visitor)
+        }
+    }
+
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: Visitor<'de>,
@@ -1169,7 +1188,7 @@ impl<'b, 'de, 'res: 'de, RES: TokenResolver, E: BinaryFlavor> de::Deserializer<'
     }
 
     serde::forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
+        bool i8 i16 i32 i64 i128 u8 u32 u64 u128 f32 f64 char str string
         bytes byte_buf option unit unit_struct newtype_struct seq tuple
         tuple_struct map enum ignored_any identifier struct
     }
@@ -1830,23 +1849,9 @@ mod tests {
             }
         }
 
-        let mut builder = eu4_builder();
-        builder.on_failed_resolve(FailedResolveStrategy::Visit);
-        let result: MyStruct = builder
-            .from_slice(&data[..], &NullResolver)
-            .unwrap()
-            .deserialize()
-            .unwrap();
-
-        let mut on_builder = OndemandBinaryDeserializerBuilder::with_flavor(Eu4Flavor::new());
-        on_builder.on_failed_resolve(FailedResolveStrategy::Visit);
-        let ondemand = on_builder
-            .deserialize_slice(&data[..], &NullResolver)
-            .unwrap();
-
-        assert_eq!(result, ondemand);
+        let actual: MyStruct = from_slice(&data[..], &NullResolver).unwrap();
         assert_eq!(
-            result,
+            actual,
             MyStruct {
                 field1: String::from("ENG"),
             }

src/binary/resolver.rs

@@ -63,7 +63,4 @@ pub enum FailedResolveStrategy {
 
     /// Ignore the token
     Ignore,
-
-    /// Visit the token
-    Visit,
 }