Merge #91

91: Implement packed arrays non-generically r=Bromeon a=ttencate

The ideal is to have a `struct PackedArray<T>`, where `T` implements some `PackedArrayElement` trait. But since the autogenerated `InnerPacked*Array` types are entirely independent at the moment and don't implement a common trait, that would require indirecting every method implementation through `PackedArrayElement`, which results in mentioning each method call three times: once in `impl PackedArray<T>`, once in `PackedArrayElement` and once in `impl PackedArrayElement for T`.

So, for now, we use a big (but quite straightforward) macro to define each `Packed*Array` as a separate type.

Co-authored-by: Thomas ten Cate <[email protected]>

Author: bors[bot]

godot-core/src/builtin/arrays.rs

@@ -6,7 +6,7 @@
 
 use godot_ffi as sys;
 
-use crate::builtin::{inner, FromVariant, ToVariant, Variant, VariantConversionError};
+use crate::builtin::*;
 use crate::obj::Share;
 use std::fmt;
 use std::marker::PhantomData;
@@ -39,16 +39,6 @@ pub struct Array {
     opaque: sys::types::OpaqueArray,
 }
 
-impl_builtin_stub!(PackedByteArray, OpaquePackedByteArray);
-impl_builtin_stub!(PackedColorArray, OpaquePackedColorArray);
-impl_builtin_stub!(PackedFloat32Array, OpaquePackedFloat32Array);
-impl_builtin_stub!(PackedFloat64Array, OpaquePackedFloat64Array);
-impl_builtin_stub!(PackedInt32Array, OpaquePackedInt32Array);
-impl_builtin_stub!(PackedInt64Array, OpaquePackedInt64Array);
-impl_builtin_stub!(PackedStringArray, OpaquePackedStringArray);
-impl_builtin_stub!(PackedVector2Array, OpaquePackedVector2Array);
-impl_builtin_stub!(PackedVector3Array, OpaquePackedVector3Array);
-
 impl_builtin_froms!(Array;
     PackedByteArray => array_from_packed_byte_array,
     PackedColorArray => array_from_packed_color_array,
@@ -61,16 +51,6 @@ impl_builtin_froms!(Array;
     PackedVector3Array => array_from_packed_vector3_array,
 );
 
-impl_builtin_froms!(PackedByteArray; Array => packed_byte_array_from_array);
-impl_builtin_froms!(PackedColorArray; Array => packed_color_array_from_array);
-impl_builtin_froms!(PackedFloat32Array; Array => packed_float32_array_from_array);
-impl_builtin_froms!(PackedFloat64Array; Array => packed_float64_array_from_array);
-impl_builtin_froms!(PackedInt32Array; Array => packed_int32_array_from_array);
-impl_builtin_froms!(PackedInt64Array; Array => packed_int64_array_from_array);
-impl_builtin_froms!(PackedStringArray; Array => packed_string_array_from_array);
-impl_builtin_froms!(PackedVector2Array; Array => packed_vector2_array_from_array);
-impl_builtin_froms!(PackedVector3Array; Array => packed_vector3_array_from_array);
-
 impl Array {
     fn from_opaque(opaque: sys::types::OpaqueArray) -> Self {
         Self { opaque }
@@ -606,18 +586,6 @@ impl GodotFfi for Array {
     }
 }
 
-fn to_i64(i: usize) -> i64 {
-    i.try_into().unwrap()
-}
-
-fn to_usize(i: i64) -> usize {
-    i.try_into().unwrap()
-}
-
-fn to_isize(i: usize) -> isize {
-    i.try_into().unwrap()
-}
-
 #[repr(C)]
 pub struct TypedArray<T> {
     opaque: OpaqueArray,

godot-core/src/builtin/mod.rs

@@ -39,6 +39,7 @@ mod arrays;
 mod color;
 mod node_path;
 mod others;
+mod packed_array;
 mod string;
 mod string_name;
 mod variant;
@@ -55,6 +56,7 @@ pub use arrays::*;
 pub use color::*;
 pub use node_path::*;
 pub use others::*;
+pub use packed_array::*;
 pub use string::*;
 pub use string_name::*;
 pub use variant::*;
@@ -71,16 +73,14 @@ pub mod inner {
     pub use crate::gen::builtin_classes::*;
 }
 
-// pub struct PackedArray<T> {
-// 	_phantom: std::marker::PhantomData<T>
-// }
-//
-// pub type PackedByteArray = PackedArray<u8>;
-// pub type PackedInt32Array = PackedArray<i32>;
-// pub type PackedInt64Array = PackedArray<i64>;
-// pub type PackedFloat32Array = PackedArray<f32>;
-// pub type PackedFloat64Array = PackedArray<f64>;
-// pub type PackedStringArray = PackedArray<GodotString>;
-// pub type PackedVector2Array = PackedArray<Vector2>;
-// pub type PackedVector3Array = PackedArray<Vector3>;
-// pub type PackedColorArray = PackedArray<Color>;
+pub(crate) fn to_i64(i: usize) -> i64 {
+    i.try_into().unwrap()
+}
+
+pub(crate) fn to_usize(i: i64) -> usize {
+    i.try_into().unwrap()
+}
+
+pub(crate) fn to_isize(i: usize) -> isize {
+    i.try_into().unwrap()
+}