fmt

Author: philipch07

crates/amf0/src/value.rs

@@ -285,6 +285,13 @@ impl serde::ser::Serialize for Amf0Value<'_> {
 impl<'de, 'a: 'de> serde::Deserializer<'de> for &'a Amf0Value<'de> {
     type Error = Amf0Error;
 
+    serde::forward_to_deserialize_any! {
+        // need to handle these number types from i8 thru f64; try to deserialze them as their original type then forward as f64
+        bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str string unit
+        option seq bytes byte_buf map unit_struct newtype_struct tuple tuple_struct
+        struct enum identifier ignored_any
+    }
+
     fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
     where
         V: serde::de::Visitor<'de>,
@@ -322,16 +329,12 @@ impl<'de, 'a: 'de> serde::Deserializer<'de> for &'a Amf0Value<'de> {
             }
             Amf0Value::String(s) => visitor.visit_borrowed_str(s.as_str()),
             Amf0Value::Array(a) => visitor.visit_seq(Amf0SeqAccess { iter: a.iter() }),
-            Amf0Value::Object(o) => visitor.visit_map(Amf0MapAccess { iter: o.iter(), value: None }),
+            Amf0Value::Object(o) => visitor.visit_map(Amf0MapAccess {
+                iter: o.iter(),
+                value: None,
+            }),
         }
     }
-
-    serde::forward_to_deserialize_any! {
-        // need to handle these number types from i8 thru f64; try to deserialze them as their original type then forward as f64
-        bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str string unit
-        option seq bytes byte_buf map unit_struct newtype_struct tuple tuple_struct
-        struct enum identifier ignored_any
-    }
 }
 
 struct Amf0SeqAccess<'a, 'de> {
@@ -367,7 +370,8 @@ impl<'de, 'a: 'de> serde::de::MapAccess<'de> for Amf0MapAccess<'a, 'de> {
         match self.iter.next() {
             Some((key, value)) => {
                 self.value = Some(value);
-                seed.deserialize(serde::de::IntoDeserializer::into_deserializer(key.as_str())).map(Some)
+                seed.deserialize(serde::de::IntoDeserializer::into_deserializer(key.as_str()))
+                    .map(Some)
             }
             None => Ok(None),
         }
@@ -388,13 +392,12 @@ mod tests {
     use std::collections::HashMap;
 
     use scuffle_bytes_util::StringCow;
+    #[cfg(feature = "serde")]
+    use serde::Deserialize;
 
     use super::Amf0Value;
     use crate::{Amf0Array, Amf0Decoder, Amf0Encoder, Amf0Error, Amf0Marker, Amf0Object};
 
-    #[cfg(feature = "serde")]
-    use serde::Deserialize;
-
     #[test]
     fn from() {
         let value: Amf0Value = 1.0.into();