Merge pull request #1090 from TitanNano/jovan/const_variant_type

GodotFfi::variant_type can be const

Author: Bromeon

godot-core/src/builtin/aabb.rs

@@ -466,9 +466,7 @@ impl std::fmt::Display for Aabb {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Aabb {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::AABB
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::AABB;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/basis.rs

@@ -632,9 +632,7 @@ impl Mul<Vector3> for Basis {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Basis {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::BASIS
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::BASIS;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/callable.rs

@@ -456,9 +456,7 @@ impl_builtin_traits! {
 // The `opaque` in `Callable` is just a pair of pointers, and requires no special initialization or cleanup
 // beyond what is done in `from_opaque` and `drop`. So using `*mut Opaque` is safe.
 unsafe impl GodotFfi for Callable {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::CALLABLE
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::CALLABLE;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque;
         fn new_from_sys;

godot-core/src/builtin/collections/array.rs

@@ -1033,9 +1033,7 @@ impl VariantArray {
 //   Arrays are properly initialized through a `from_sys` call, but the ref-count should be incremented
 //   as that is the callee's responsibility. Which we do by calling `std::mem::forget(array.clone())`.
 unsafe impl<T: ArrayElement> GodotFfi for Array<T> {
-    fn variant_type() -> VariantType {
-        VariantType::ARRAY
-    }
+    const VARIANT_TYPE: VariantType = VariantType::ARRAY;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
 }
@@ -1292,9 +1290,9 @@ impl<T: ArrayElement> GodotFfiVariant for Array<T> {
 
     fn ffi_from_variant(variant: &Variant) -> Result<Self, ConvertError> {
         // First check if the variant is an array. The array conversion shouldn't be called otherwise.
-        if variant.get_type() != Self::variant_type() {
+        if variant.get_type() != Self::VARIANT_TYPE {
             return Err(FromVariantError::BadType {
-                expected: Self::variant_type(),
+                expected: Self::VARIANT_TYPE,
                 actual: variant.get_type(),
             }
             .into_error(variant.clone()));

godot-core/src/builtin/collections/dictionary.rs

@@ -342,9 +342,7 @@ impl Dictionary {
 //   incremented as that is the callee's responsibility. Which we do by calling
 //   `std::mem::forget(dictionary.clone())`.
 unsafe impl GodotFfi for Dictionary {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::DICTIONARY
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::DICTIONARY;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
 }

godot-core/src/builtin/collections/packed_array.rs

@@ -626,9 +626,7 @@ macro_rules! impl_packed_array {
         }
 
         unsafe impl GodotFfi for $PackedArray {
-            fn variant_type() -> sys::VariantType {
-                sys::VariantType::$VariantType
-            }
+            const VARIANT_TYPE: sys::VariantType = sys::VariantType::$VariantType;
 
             ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
         }

godot-core/src/builtin/color.rs

@@ -355,9 +355,7 @@ impl Color {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Color {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::COLOR
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::COLOR;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/plane.rs

@@ -265,9 +265,7 @@ impl Neg for Plane {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Plane {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::PLANE
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::PLANE;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self;
         fn new_from_sys;

godot-core/src/builtin/projection.rs

@@ -557,9 +557,7 @@ impl GlamConv for Projection {
 
 // SAFETY: This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Projection {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::PROJECTION
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::PROJECTION;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/quaternion.rs

@@ -347,9 +347,7 @@ impl Mul<Vector3> for Quaternion {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Quaternion {
-    fn variant_type() -> sys::VariantType {
-        sys::VariantType::QUATERNION
-    }
+    const VARIANT_TYPE: sys::VariantType = sys::VariantType::QUATERNION;
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }