Merge branch 'master' into fork/TitanNano/jovan/eliminate_param_type

Rename duplicate class SignalObject -> SignalDisc

# Conflicts:
#	godot-core/src/builtin/collections/array.rs
#	godot-core/src/meta/traits.rs

Author: Bromeon

.github/workflows/full-ci.yml

@@ -246,7 +246,7 @@ jobs:
             os: macos-13
             artifact-name: macos-x86-nightly
             godot-binary: godot.macos.editor.dev.x86_64
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: macos-double-x86
             os: macos-13
@@ -264,7 +264,7 @@ jobs:
             os: macos-latest
             artifact-name: macos-arm-nightly
             godot-binary: godot.macos.editor.dev.arm64
-            with-hot-reload: true
+            hot-reload: stable
 
            # api-custom on macOS arm64 not working, due to clang linker issues.
 #          - name: macos-double-arm
@@ -285,7 +285,7 @@ jobs:
             os: windows-latest
             artifact-name: windows-nightly
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: windows-double
             os: windows-latest
@@ -317,7 +317,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/codegen-full
-            with-hot-reload: true
+            hot-reload: api-custom
 
           # Combines now a lot of features, but should be OK. lazy-function-tables doesn't work with experimental-threads.
           - name: linux-double-lazy
@@ -352,12 +352,14 @@ jobs:
             rust-cache-key: release
 
           # Linux compat (4.1 disabled, already covered by memcheck)
+          # No hot-reload before 4.4, as the Godot project is 4.4+.
 
           - name: linux-4.4
             os: ubuntu-22.04
             artifact-name: linux-4.4
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.4'
+            hot-reload: stable
 
           - name: linux-4.3
             os: ubuntu-22.04
@@ -418,10 +420,11 @@ jobs:
           godot-indirect-json: ${{ matrix.godot-indirect-json }}
 
       - name: "Build and test hot-reload"
-        if: ${{ matrix.with-hot-reload }}
+        if: ${{ matrix.hot-reload }}
         working-directory: itest/hot-reload/godot
         # Repeat a few times, our hot reload integration test can sometimes be a bit flaky.
-        run: $RETRY ./run-test.sh
+        # Don't pass in rust-extra-args as environment; they're intended for itest.
+        run: $RETRY ./run-test.sh ${{ matrix.hot-reload }}
         shell: bash
 
 

.github/workflows/minimal-ci.yml

@@ -159,7 +159,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/codegen-full
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: linux-custom-api-json
             os: ubuntu-22.04
@@ -173,6 +173,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/experimental-threads,itest/codegen-full-experimental,godot/api-custom,godot/serde,itest/register-docs
+            hot-reload: api-custom
 
           - name: linux-release
             os: ubuntu-22.04
@@ -240,9 +241,9 @@ jobs:
           godot-indirect-json: ${{ matrix.godot-indirect-json }}
 
       - name: "Build and test hot-reload"
-        if: ${{ matrix.with-hot-reload }}
+        if: ${{ matrix.hot-reload }}
         working-directory: itest/hot-reload/godot
-        run: ./run-test.sh
+        run: ./run-test.sh ${{ matrix.hot-reload }}
         shell: bash
 
 

godot-core/src/builtin/aabb.rs

@@ -6,7 +6,7 @@
  */
 
 use godot_ffi as sys;
-use sys::{ffi_methods, GodotFfi};
+use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
 use crate::builtin::math::ApproxEq;
 use crate::builtin::{real, Plane, Vector3, Vector3Axis};
@@ -448,7 +448,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 {
-    const VARIANT_TYPE: sys::VariantType = sys::VariantType::AABB;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::AABB);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/basis.rs

@@ -6,7 +6,7 @@
  */
 
 use godot_ffi as sys;
-use sys::{ffi_methods, GodotFfi};
+use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
 use crate::builtin::math::{ApproxEq, FloatExt, GlamConv, GlamType, XformInv};
 use crate::builtin::real_consts::FRAC_PI_2;
@@ -631,7 +631,7 @@ impl XformInv<Vector3> for Basis {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Basis {
-    const VARIANT_TYPE: sys::VariantType = sys::VariantType::BASIS;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::BASIS);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }

godot-core/src/builtin/callable.rs

@@ -14,7 +14,7 @@ use crate::obj::bounds::DynMemory;
 use crate::obj::Bounds;
 use crate::obj::{Gd, GodotClass, InstanceId};
 use std::{fmt, ptr};
-use sys::{ffi_methods, GodotFfi};
+use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
 #[cfg(all(since_api = "4.2", before_api = "4.3"))]
 type CallableCustomInfo = sys::GDExtensionCallableCustomInfo;
@@ -441,7 +441,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 {
-    const VARIANT_TYPE: sys::VariantType = sys::VariantType::CALLABLE;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::CALLABLE);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque;
         fn new_from_sys;

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

@@ -13,8 +13,8 @@ use crate::meta;
 use crate::meta::error::{ConvertError, FromGodotError, FromVariantError};
 use crate::meta::{
     element_godot_type_name, element_variant_type, ArrayElement, ArrayTypeInfo, AsArg, ByRef,
-    ClassName, FromGodot, GodotConvert, GodotFfiVariant, GodotType, ParamType, PropertyHintInfo,
-    RefArg, ToGodot,
+    ClassName, ExtVariantType, FromGodot, GodotConvert, GodotFfiVariant, GodotType, ParamType,
+    PropertyHintInfo, RefArg, ToGodot,
 };
 use crate::obj::{bounds, Bounds, DynGd, Gd, GodotClass};
 use crate::registry::property::{BuiltinExport, Export, Var};
@@ -1110,7 +1110,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> {
-    const VARIANT_TYPE: VariantType = VariantType::ARRAY;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(VariantType::ARRAY);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
 }
@@ -1350,9 +1350,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.variant_as_nil() {
             return Err(FromVariantError::BadType {
-                expected: Self::VARIANT_TYPE,
+                expected: Self::VARIANT_TYPE.variant_as_nil(),
                 actual: variant.get_type(),
             }
             .into_error(variant.clone()));

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

@@ -8,7 +8,7 @@
 use godot_ffi as sys;
 
 use crate::builtin::{inner, Variant, VariantArray};
-use crate::meta::{FromGodot, ToGodot};
+use crate::meta::{ExtVariantType, FromGodot, ToGodot};
 use sys::types::OpaqueDictionary;
 use sys::{ffi_methods, interface_fn, GodotFfi};
 
@@ -394,7 +394,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 {
-    const VARIANT_TYPE: sys::VariantType = sys::VariantType::DICTIONARY;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::DICTIONARY);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
 }

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

@@ -17,7 +17,7 @@ use crate::meta::{AsArg, ToGodot};
 use std::mem::size_of;
 use std::{fmt, ops, ptr};
 use sys::types::*;
-use sys::{ffi_methods, interface_fn, GodotFfi};
+use sys::{ffi_methods, interface_fn, ExtVariantType, GodotFfi};
 
 use crate::classes::file_access::CompressionMode;
 use crate::meta;
@@ -625,7 +625,7 @@ macro_rules! impl_packed_array {
         }
 
         unsafe impl GodotFfi for $PackedArray {
-            const VARIANT_TYPE: sys::VariantType = sys::VariantType::$VariantType;
+            const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::$VariantType);
 
             ffi_methods! { type sys::GDExtensionTypePtr = *mut Opaque; .. }
         }

godot-core/src/builtin/color.rs

@@ -13,7 +13,7 @@ use crate::builtin::{ColorHsv, GString};
 use crate::meta::{arg_into_ref, AsArg};
 use godot_ffi as sys;
 use std::ops;
-use sys::{ffi_methods, GodotFfi};
+use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
 /// Color built-in type, in floating-point RGBA format.
 ///
@@ -358,7 +358,7 @@ impl Color {
 // SAFETY:
 // This type is represented as `Self` in Godot, so `*mut Self` is sound.
 unsafe impl GodotFfi for Color {
-    const VARIANT_TYPE: sys::VariantType = sys::VariantType::COLOR;
+    const VARIANT_TYPE: ExtVariantType = ExtVariantType::Concrete(sys::VariantType::COLOR);
 
     ffi_methods! { type sys::GDExtensionTypePtr = *mut Self; .. }
 }