Suggestions from toasteater & used untagged repr for Variant

Author: Waridley

gdnative-core/src/core_types/dictionary.rs

@@ -556,7 +556,7 @@ pub(super) mod serde {
 
     impl Serialize for Dictionary {
         #[inline]
-        fn serialize<S>(&self, ser: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+        fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
         where
             S: Serializer,
         {
@@ -577,7 +577,7 @@ pub(super) mod serde {
             formatter.write_str("a Dictionary")
         }
 
-        fn visit_map<A>(self, mut map: A) -> Result<Self::Value, <A as MapAccess<'de>>::Error>
+        fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
         where
             A: MapAccess<'de>,
         {
@@ -589,33 +589,15 @@ pub(super) mod serde {
         }
     }
 
-    impl<'de> Deserialize<'de> for Dictionary<Unique> {
+    impl<'de, Access: ThreadAccess> Deserialize<'de> for Dictionary<Access> {
         #[inline]
         fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where
             D: Deserializer<'de>,
         {
-            deserializer.deserialize_map(DictionaryVisitor)
-        }
-    }
-
-    impl<'de> Deserialize<'de> for Dictionary<Shared> {
-        #[inline]
-        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where
-            D: Deserializer<'de>,
-        {
-            Dictionary::<Unique>::deserialize(deserializer).map(Dictionary::into_shared)
-        }
-    }
-
-    impl<'de> Deserialize<'de> for Dictionary<ThreadLocal> {
-        #[inline]
-        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where
-            D: Deserializer<'de>,
-        {
-            Dictionary::<Unique>::deserialize(deserializer).map(Dictionary::into_thread_local)
+            deserializer
+                .deserialize_map(DictionaryVisitor)
+                .map(|dict| unsafe { dict.cast_access() })
         }
     }
 }