Revert "Merge pull request #581 from lilizoey/fix/static-mut-safety"

godot-core/Cargo.toml

@@ -18,7 +18,7 @@ codegen-lazy-fptrs = [
 custom-godot = ["godot-ffi/custom-godot", "godot-codegen/custom-godot"]
 double-precision = ["godot-codegen/double-precision"]
 experimental-godot-api = ["godot-codegen/experimental-godot-api"]
-experimental-threads = ["godot-ffi/experimental-threads"]
+experimental-threads = []
 trace = ["godot-ffi/trace"]
 
 [dependencies]

godot-core/src/builtin/meta/signature.rs

@@ -227,7 +227,7 @@ macro_rules! impl_varcall_signature_for_tuple {
                 let variant = Variant::from_var_sys_init(|return_ptr| {
                     let mut err = sys::default_call_error();
                     class_fn(
-                        method_bind.0,
+                        method_bind,
                         object_ptr,
                         variant_ptrs.as_ptr(),
                         variant_ptrs.len() as i64,
@@ -390,7 +390,7 @@ macro_rules! impl_ptrcall_signature_for_tuple {
                 ];
 
                 let result = Rr::call(|return_ptr| {
-                    class_fn(method_bind.0, object_ptr, type_ptrs.as_ptr(), return_ptr);
+                    class_fn(method_bind, object_ptr, type_ptrs.as_ptr(), return_ptr);
                 });
                 result.unwrap_or_else(|err| return_error::<Self::Ret>(&call_ctx, err))
             }

godot-core/src/init/mod.rs

@@ -7,6 +7,7 @@
 
 use godot_ffi as sys;
 
+use std::cell;
 use sys::GodotFfi;
 
 use crate::builtin::{GString, StringName};
@@ -27,7 +28,10 @@ pub unsafe fn __gdext_load_library<E: ExtensionLibrary>(
             EditorRunBehavior::AllClasses => false,
         };
 
-        let config = sys::GdextConfig::new(tool_only_in_editor);
+        let config = sys::GdextConfig {
+            tool_only_in_editor,
+            is_editor: cell::OnceCell::new(),
+        };
 
         sys::initialize(interface_or_get_proc_address, library, config);
 

godot-ffi/Cargo.toml

@@ -12,7 +12,6 @@ custom-godot = ["godot-bindings/custom-godot"]
 codegen-fmt = ["godot-codegen/codegen-fmt"]
 codegen-lazy-fptrs = ["godot-codegen/codegen-lazy-fptrs"]
 experimental-godot-api = ["godot-codegen/experimental-godot-api"]
-experimental-threads = []
 trace = []
 
 # TODO: get rid of paste and gensym, they are trivially implementable with proc-macros. Update cargo-deny.