move godot compat

Author: lilizoey

godot-core/src/builtin/meta/godot_compat.rs renamed to godot-core/src/builtin/meta/godot_compat/impls.rs

@@ -4,11 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use godot_ffi as sys;
+use crate::builtin::meta::GodotType;
 
-pub trait GodotCompatible {
-    type Via: GodotType;
-}
+use super::*;
 
 impl<T: GodotCompatible> GodotCompatible for Option<T>
 where
@@ -17,37 +15,6 @@ where
     type Via = Option<T::Via>;
 }
 
-pub trait ToGodot: Sized + GodotCompatible {
-    fn to_godot(&self) -> Self::Via;
-
-    fn into_godot(self) -> Self::Via {
-        self.to_godot()
-    }
-
-    fn to_variant(&self) -> Variant {
-        self.to_godot().to_ffi().ffi_to_variant()
-    }
-}
-
-pub trait FromGodot: Sized + GodotCompatible {
-    // TODO: better error
-    fn try_from_godot(via: Self::Via) -> Option<Self>;
-
-    fn from_godot(via: Self::Via) -> Self {
-        Self::try_from_godot(via).unwrap()
-    }
-
-    fn try_from_variant(variant: &Variant) -> Result<Self, VariantConversionError> {
-        let ffi = <Self::Via as GodotType>::Ffi::ffi_from_variant(variant)?;
-        let via = Self::Via::try_from_ffi(ffi).ok_or(VariantConversionError::BadValue)?;
-        Self::try_from_godot(via).ok_or(VariantConversionError::BadValue)
-    }
-
-    fn from_variant(variant: &Variant) -> Self {
-        Self::try_from_variant(variant).unwrap()
-    }
-}
-
 impl<T: ToGodot> ToGodot for Option<T>
 where
     Option<T::Via>: GodotType,
@@ -77,49 +44,6 @@ where
     }
 }
 
-pub(crate) fn into_ffi<T: ToGodot>(t: T) -> <T::Via as GodotType>::Ffi {
-    let via = t.into_godot();
-    via.into_ffi()
-}
-
-pub(crate) fn try_from_ffi<T: FromGodot>(ffi: <T::Via as GodotType>::Ffi) -> Option<T> {
-    let via = <T::Via as GodotType>::try_from_ffi(ffi)?;
-    T::try_from_godot(via)
-}
-
-macro_rules! impl_godot_as_self {
-    ($T:ty$(, $param_metadata:expr)?) => {
-        impl $crate::builtin::meta::GodotCompatible for $T {
-            type Via = $T;
-        }
-
-        impl $crate::builtin::meta::ToGodot for $T {
-            #[inline]
-            fn to_godot(&self) -> Self::Via {
-                self.clone()
-            }
-
-            #[inline]
-            fn into_godot(self) -> Self::Via {
-                self
-            }
-        }
-
-        impl $crate::builtin::meta::FromGodot for $T {
-            #[inline]
-            fn try_from_godot(via: Self::Via) -> Option<Self> {
-                Some(via)
-            }
-        }
-    };
-}
-
-pub(crate) use impl_godot_as_self;
-
-use crate::builtin::{Variant, VariantConversionError};
-
-use super::{GodotFfiVariant, GodotType};
-
 impl GodotCompatible for sys::VariantType {
     type Via = i64;
 }
@@ -193,8 +117,8 @@ impl<T> FromGodot for *const T {
 }
 
 mod scalars {
-    use super::super::GodotType;
     use super::{impl_godot_as_self, FromGodot, GodotCompatible, ToGodot};
+    use crate::builtin::meta::GodotType;
     use godot_ffi as sys;
 
     macro_rules! impl_godot {

godot-core/src/builtin/meta/godot_compat/mod.rs

@@ -0,0 +1,87 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+mod impls;
+
+use godot_ffi as sys;
+
+use crate::builtin::{Variant, VariantConversionError};
+
+use super::{GodotFfiVariant, GodotType};
+
+pub trait GodotCompatible {
+    type Via: GodotType;
+}
+
+pub trait ToGodot: Sized + GodotCompatible {
+    fn to_godot(&self) -> Self::Via;
+
+    fn into_godot(self) -> Self::Via {
+        self.to_godot()
+    }
+
+    fn to_variant(&self) -> Variant {
+        self.to_godot().to_ffi().ffi_to_variant()
+    }
+}
+
+pub trait FromGodot: Sized + GodotCompatible {
+    // TODO: better error
+    fn try_from_godot(via: Self::Via) -> Option<Self>;
+
+    fn from_godot(via: Self::Via) -> Self {
+        Self::try_from_godot(via).unwrap()
+    }
+
+    fn try_from_variant(variant: &Variant) -> Result<Self, VariantConversionError> {
+        let ffi = <Self::Via as GodotType>::Ffi::ffi_from_variant(variant)?;
+        let via = Self::Via::try_from_ffi(ffi).ok_or(VariantConversionError::BadValue)?;
+        Self::try_from_godot(via).ok_or(VariantConversionError::BadValue)
+    }
+
+    fn from_variant(variant: &Variant) -> Self {
+        Self::try_from_variant(variant).unwrap()
+    }
+}
+
+pub(crate) fn into_ffi<T: ToGodot>(t: T) -> <T::Via as GodotType>::Ffi {
+    let via = t.into_godot();
+    via.into_ffi()
+}
+
+pub(crate) fn try_from_ffi<T: FromGodot>(ffi: <T::Via as GodotType>::Ffi) -> Option<T> {
+    let via = <T::Via as GodotType>::try_from_ffi(ffi)?;
+    T::try_from_godot(via)
+}
+
+macro_rules! impl_godot_as_self {
+    ($T:ty$(, $param_metadata:expr)?) => {
+        impl $crate::builtin::meta::GodotCompatible for $T {
+            type Via = $T;
+        }
+
+        impl $crate::builtin::meta::ToGodot for $T {
+            #[inline]
+            fn to_godot(&self) -> Self::Via {
+                self.clone()
+            }
+
+            #[inline]
+            fn into_godot(self) -> Self::Via {
+                self
+            }
+        }
+
+        impl $crate::builtin::meta::FromGodot for $T {
+            #[inline]
+            fn try_from_godot(via: Self::Via) -> Option<Self> {
+                Some(via)
+            }
+        }
+    };
+}
+
+pub(crate) use impl_godot_as_self;