Upgrade to gdext 0.2.x (#59)

Fixes #58

Author: TitanNano

Cargo.lock

@@ -10,15 +10,16 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace.dependencies]
-godot = { git = "https://github.com/godot-rust/gdext", tag = "v0.1.3", features = ["experimental-threads"] }
-godot-cell = { git = "https://github.com/godot-rust/gdext", tag = "v0.1.3" }
-itertools = "0.10.3"
-rand = "0.8.5"
+godot = { version = "0.2", features = ["experimental-threads"] }
+godot-cell = "0.2"
+godot-bindings = "0.2"
+itertools = "0.10"
+rand = "0.8"
 darling = { version = "0.20" }
-proc-macro2 = "1.0.68"
+proc-macro2 = "1.0"
 quote = "1"
 syn = "2"
-const-str = "0.5.6"
+const-str = "0.5"
 thiserror = "1"
 
 godot-rust-script-derive = { path = "derive" }

Cargo.toml

@@ -93,6 +93,8 @@ pub fn script_enum_derive(input: proc_macro::TokenStream) -> proc_macro::TokenSt
         }
 
         impl #godot_types::meta::ToGodot for #enum_ident {
+            type ToVia<'a> = Self::Via;
+
             fn to_godot(&self) -> Self::Via {
                 #enum_from_self::from(self)
             }

derive/src/enums.rs

@@ -292,7 +292,7 @@ fn generate_public_interface(impl_body: &ItemImpl) -> TokenStream {
 
             quote_spanned! { func.span() =>
                 #func {
-                    (*self).call(#func_name.into(), &[#args]).to()
+                    (*self).call(#func_name, &[#args]).to()
                 }
             }
         })

derive/src/impl_attribute.rs

@@ -21,6 +21,9 @@ thiserror.workspace = true
 tests-scripts-lib = { path = "../tests-scripts-lib" }
 godot-rust-script = { path = "./", features = ["runtime"] }
 
+[build-dependencies]
+godot-bindings.workspace = true
+
 [features]
 default = ["runtime", "scripts"]
 runtime = ["dep:itertools", "dep:rand"]

rust-script/Cargo.toml

@@ -0,0 +1,9 @@
+/*
+ * 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 http://mozilla.org/MPL/2.0/.
+ */
+
+fn main() {
+    godot_bindings::emit_godot_version_cfg();
+}

rust-script/build.rs

@@ -4,49 +4,61 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-use godot::engine::{EditorInterface, Engine};
-use godot::log::godot_warn;
+use godot::classes::{EditorInterface, Engine};
+use godot::global::godot_warn;
 use godot::meta::ToGodot;
 use godot::prelude::GodotConvert;
 
 #[derive(Clone, Copy)]
-pub enum EditorToaserSeverity {
+pub enum EditorToasterSeverity {
     Warning,
 }
 
-impl From<EditorToaserSeverity> for u8 {
-    fn from(value: EditorToaserSeverity) -> Self {
-        use EditorToaserSeverity::*;
+impl From<EditorToasterSeverity> for u8 {
+    fn from(value: EditorToasterSeverity) -> Self {
+        use EditorToasterSeverity::*;
 
         match value {
             Warning => 1,
         }
     }
 }
 
-impl GodotConvert for EditorToaserSeverity {
+impl GodotConvert for EditorToasterSeverity {
     type Via = u8;
 }
 
-impl ToGodot for EditorToaserSeverity {
-    fn to_godot(&self) -> Self::Via {
+impl ToGodot for EditorToasterSeverity {
+    type ToVia<'v> = Self::Via;
+
+    fn to_godot(&self) -> Self::ToVia<'static> {
         (*self).into()
     }
 }
 
-pub fn show_editor_toast(message: &str, severity: EditorToaserSeverity) {
+pub fn show_editor_toast(message: &str, severity: EditorToasterSeverity) {
     if !Engine::singleton().is_editor_hint() {
         return;
     }
 
+    #[cfg(before_api = "4.2")]
+    let Some(base_control) = Engine::singleton()
+        .get_singleton("EditorInterface")
+        .and_then(|obj| obj.cast::<EditorInterface>().get_base_control())
+    else {
+        godot_warn!("[godot-rust-script] unable to access editor UI!");
+        return;
+    };
+
+    #[cfg(since_api = "4.2")]
     let Some(base_control) = EditorInterface::singleton().get_base_control() else {
         godot_warn!("[godot-rust-script] unable to access editor UI!");
         return;
     };
 
     let editor_toaser = base_control
-        .find_children_ex("*".into())
-        .type_("EditorToaster".into())
+        .find_children_ex("*")
+        .type_("EditorToaster")
         .recursive(true)
         .owned(false)
         .done()
@@ -57,13 +69,13 @@ pub fn show_editor_toast(message: &str, severity: EditorToaserSeverity) {
         return;
     };
 
-    if !editor_toaser.has_method("_popup_str".into()) {
+    if !editor_toaser.has_method("_popup_str") {
         godot_warn!("[godot-rust-script] Internal toast notifications API no longer exists!");
         return;
     }
 
     editor_toaser.call(
-        "_popup_str".into(),
+        "_popup_str",
         &[message.to_variant(), severity.to_variant(), "".to_variant()],
     );
 }

rust-script/src/editor_ui_hacks.rs

@@ -13,7 +13,7 @@ use godot::builtin::{
     Rect2, Rect2i, Rid, StringName, Transform2D, Transform3D, Vector2, Vector2i, Vector3, Vector3i,
     Vector4, Vector4i,
 };
-use godot::engine::{Node, Resource};
+use godot::classes::{Node, Resource};
 use godot::global::PropertyHint;
 use godot::meta::{ArrayElement, FromGodot, GodotConvert, GodotType, ToGodot};
 use godot::obj::{EngineEnum, Gd};
@@ -32,7 +32,7 @@ impl<T: GodotClass> GodotScriptExport for Gd<T> {
             return custom;
         }
 
-        T::class_name().as_str().to_owned()
+        T::class_name().to_string()
     }
 
     fn hint(custom: Option<PropertyHint>) -> PropertyHint {
@@ -52,7 +52,11 @@ impl<T: GodotClass> GodotScriptExport for Gd<T> {
 
 impl<T: GodotScriptExport> GodotScriptExport for Option<T>
 where
+    for<'v> T: 'v,
+    for<'v> <<T as ToGodot>::ToVia<'v> as GodotType>::Ffi: godot::sys::GodotNullableFfi,
+    for<'f> <<T as GodotConvert>::Via as GodotType>::ToFfi<'f>: godot::sys::GodotNullableFfi,
     <<T as GodotConvert>::Via as GodotType>::Ffi: godot::sys::GodotNullableFfi,
+    for<'v, 'f> <<T as ToGodot>::ToVia<'v> as GodotType>::ToFfi<'f>: godot::sys::GodotNullableFfi,
 {
     fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String {
         T::hint_string(custom_hint, custom_string)
@@ -63,7 +67,7 @@ where
     }
 }
 
-impl<T: ArrayElement + GodotScriptExport> GodotScriptExport for Array<T> {
+impl<T: ArrayElement + GodotScriptExport + GodotType> GodotScriptExport for Array<T> {
     fn hint_string(custom_hint: Option<PropertyHint>, custom_string: Option<String>) -> String {
         let element_type = <<T as GodotType>::Ffi as GodotFfi>::variant_type().ord();
         let element_hint = <T as GodotScriptExport>::hint(custom_hint).ord();

rust-script/src/interface/export.rs

@@ -160,11 +160,11 @@ impl<T: SignalArguments> ScriptSignal for Signal<T> {
     fn emit(&self, args: Self::Args) {
         self.host
             .clone()
-            .emit_signal(StringName::from(self.name), &args.to_variants());
+            .emit_signal(self.name, &args.to_variants());
     }
 
     fn connect(&mut self, callable: Callable) -> Result<(), Error> {
-        match self.host.connect(self.name.into(), callable) {
+        match self.host.connect(self.name, &callable) {
             Error::OK => Ok(()),
             error => Err(error),
         }
@@ -184,6 +184,11 @@ impl<T: SignalArguments> GodotConvert for Signal<T> {
 }
 
 impl<T: SignalArguments> ToGodot for Signal<T> {
+    type ToVia<'v>
+        = Self::Via
+    where
+        Self: 'v;
+
     fn to_godot(&self) -> Self::Via {
         godot::builtin::Signal::from_object_signal(&self.host, self.name)
     }

rust-script/src/interface/signals.rs

@@ -22,13 +22,13 @@ pub struct Context<'a, Script: GodotScriptImpl + ?Sized> {
     base_type: PhantomData<Script>,
 }
 
-impl<'a, Script: GodotScriptImpl> Debug for Context<'a, Script> {
+impl<Script: GodotScriptImpl> Debug for Context<'_, Script> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str("Context { <Call Context> }")
     }
 }
 
-impl<'a, Script: GodotScriptImpl> Context<'a, Script> {
+impl<Script: GodotScriptImpl> Context<'_, Script> {
     pub fn reentrant_scope<T: GodotScriptObject + 'static, Args, Return>(
         &mut self,
         self_ref: &mut T,