Migrate to godot-rust 0.4 (#80)

Author: TitanNano

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
       RUSTFLAGS: "-D warnings"
     strategy:
       matrix:
-        api_version: ["4-1", "4-2", "4-3", "4-4"]
+        api_version: ["4-2", "4-3", "4-4", "4-5"]
 
     steps:
     - name: Checkout
@@ -49,7 +49,7 @@ jobs:
     runs-on: "ubuntu-22.04"
     strategy:
       matrix:
-        api_version: ["4-1", "4-2", "4-3", "4-4"]
+        api_version: ["4-2", "4-3", "4-4", "4-5"]
 
     steps:
       - name: Checkout
@@ -75,7 +75,7 @@ jobs:
     runs-on: "ubuntu-22.04"
     strategy:
       matrix:
-        api_version: ["4-1", "4-2", "4-3", "4-4", "custom"]
+        api_version: ["4-2", "4-3", "4-4", "4-5", "custom"]
 
     steps:
       - name: Checkout

.github/workflows/nightly-check.yaml

@@ -16,7 +16,7 @@ jobs:
       RUSTFLAGS: "-D warnings"
     strategy:
       matrix:
-        api_version: ["4-1", "4-2", "4-3", "4-4"]
+        api_version: ["4-2", "4-3", "4-4", "4-5"]
 
     steps:
     - name: Checkout

Cargo.lock

@@ -10,9 +10,9 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace.dependencies]
-godot = { version = "0.3.2", features = ["experimental-threads"] }
-godot-cell = "0.3"
-godot-bindings = "0.3"
+godot = { version = ">=0.4.1", features = ["experimental-threads"] }
+godot-cell = "0.4.0"
+godot-bindings = "0.4.0"
 itertools = "0.10"
 rand = "0.8"
 darling = { version = "0.20" }

Cargo.toml

@@ -93,7 +93,7 @@ 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;
+            type Pass = ::godot::meta::ByValue;
 
             fn to_godot(&self) -> Self::Via {
                 #enum_from_self::from(self)

derive/src/enums.rs

@@ -25,7 +25,7 @@ pub fn godot_script_impl(
     let godot_types = godot_types();
     let string_name_ty = string_name_ty();
     let variant_ty = variant_ty();
-    let call_error_ty = quote!(#godot_types::sys::GDExtensionCallErrorType);
+    let call_error_ty = quote!(#godot_types::meta::error::CallErrorType);
     let property_hints = property_hints();
 
     let current_type = &body.self_ty;
@@ -73,7 +73,7 @@ pub fn godot_script_impl(
                                 ::godot_rust_script::private_export::RustScriptPropDesc {
                                     name: stringify!(#arg_name),
                                     ty: #arg_type,
-                                    class_name: <<#arg_rust_type as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_name(),
+                                    class_name: <<#arg_rust_type as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_id(),
                                     exported: false,
                                     hint: #property_hints::NONE,
                                     hint_string: String::new(),
@@ -84,10 +84,10 @@ pub fn godot_script_impl(
                             quote_spanned! {
                                 arg.span() =>
                                 #godot_types::prelude::FromGodot::try_from_variant(
-                                    args.get(#index).ok_or(#godot_types::sys::GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS)?
+                                    args.get(#index).ok_or(#call_error_ty::TooFewArguments)?
                                 ).map_err(|err| {
                                     #godot_types::global::godot_error!("failed to convert variant for argument {} of {}: {}", stringify!(#arg_name), #fn_name_str,  err);
-                                    #godot_types::sys::GDEXTENSION_CALL_ERROR_INVALID_ARGUMENT
+                                    #call_error_ty::InvalidArgument
                                 })?,
                             }
                         )
@@ -104,7 +104,7 @@ pub fn godot_script_impl(
                 fnc.span() =>
                 #fn_name_str => {
                     if args.len() > #arg_count {
-                        return Err(#godot_types::sys::GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS);
+                        return Err(#call_error_ty::TooManyArguments);
                     }
 
                     Ok(#godot_types::prelude::ToGodot::to_variant(&self.#fn_name(#args)))
@@ -134,7 +134,7 @@ pub fn godot_script_impl(
                     return_type: ::godot_rust_script::private_export::RustScriptPropDesc {
                         name: #fn_name_str,
                         ty: #fn_return_ty,
-                        class_name: <<#fn_return_ty_rust as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_name(),
+                        class_name: <<#fn_return_ty_rust as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_id(),
                         exported: false,
                         hint: #property_hints::NONE,
                         hint_string: String::new(),
@@ -164,7 +164,7 @@ pub fn godot_script_impl(
                 match name.to_string().as_str() {
                     #method_dispatch
 
-                    _ => Err(#godot_types::sys::GDEXTENSION_CALL_ERROR_INVALID_METHOD),
+                    _ => Err(#call_error_ty::InvalidMethod),
                 }
             }
         }

derive/src/impl_attribute.rs

@@ -28,7 +28,7 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let godot_types = godot_types();
     let variant_ty = variant_ty();
     let string_name_ty = string_name_ty();
-    let call_error_ty = quote!(#godot_types::sys::GDExtensionCallErrorType);
+    let call_error_ty = quote!(#godot_types::meta::error::CallErrorType);
 
     let base_class = opts
         .base
@@ -409,7 +409,7 @@ fn derive_field_metadata(
         ::godot_rust_script::private_export::RustScriptPropDesc {
             name: #name,
             ty: #ty,
-            class_name: <<#rust_ty as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_name(),
+            class_name: <<#rust_ty as #godot_types::meta::GodotConvert>::Via as #godot_types::meta::GodotType>::class_id(),
             exported: #is_exported,
             hint: #hint,
             hint_string: #hint_string,

derive/src/lib.rs

@@ -6,7 +6,8 @@
 
 use godot::classes::{EditorInterface, Engine};
 use godot::global::godot_warn;
-use godot::meta::ToGodot;
+use godot::meta::{ByValue, ToGodot};
+use godot::obj::Singleton as _;
 use godot::prelude::GodotConvert;
 
 #[derive(Clone, Copy)]
@@ -29,9 +30,9 @@ impl GodotConvert for EditorToasterSeverity {
 }
 
 impl ToGodot for EditorToasterSeverity {
-    type ToVia<'v> = Self::Via;
+    type Pass = ByValue;
 
-    fn to_godot(&self) -> Self::ToVia<'static> {
+    fn to_godot(&self) -> Self::Via {
         (*self).into()
     }
 }

rust-script/src/editor_ui_hacks.rs

@@ -12,11 +12,13 @@ use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::{collections::HashMap, fmt::Debug};
 
-use godot::meta::{FromGodot, GodotConvert, ToGodot};
+use godot::meta::error::CallErrorType;
+use godot::meta::{ByValue, FromGodot, GodotConvert, ToGodot};
 use godot::obj::Inherits;
 use godot::prelude::{ConvertError, Gd, Object, StringName, Variant};
 
 pub use crate::runtime::Context;
+use crate::runtime::RustScript;
 
 pub use export::GodotScriptExport;
 pub use on_editor::OnEditor;
@@ -35,7 +37,7 @@ pub trait GodotScript: Debug + GodotScriptImpl<ImplBase = Self::Base> {
         method: StringName,
         args: &[&Variant],
         context: Context<'_, Self>,
-    ) -> Result<Variant, godot::sys::GDExtensionCallErrorType>;
+    ) -> Result<Variant, CallErrorType>;
 
     fn to_string(&self) -> String;
     fn property_state(&self) -> HashMap<StringName, Variant>;
@@ -51,7 +53,7 @@ pub trait GodotScriptImpl {
         name: StringName,
         args: &[&Variant],
         context: Context<Self>,
-    ) -> Result<Variant, godot::sys::GDExtensionCallErrorType>;
+    ) -> Result<Variant, godot::meta::error::CallErrorType>;
 }
 
 #[derive(Debug)]
@@ -72,7 +74,8 @@ impl<T: GodotScript> RsRef<T> {
         let script = owner
             .upcast_ref::<Object>()
             .get_script()
-            .try_to::<Option<Gd<crate::runtime::RustScript>>>();
+            .map(|script| script.try_cast::<RustScript>())
+            .transpose();
 
         let Ok(script) = script else {
             return Some(GodotScriptCastError::NotRustScript);
@@ -127,20 +130,16 @@ where
 }
 
 impl<T: GodotScript> ToGodot for RsRef<T> {
-    type ToVia<'v>
-        = Gd<T::Base>
-    where
-        Self: 'v;
+    type Pass = ByValue;
 
-    fn to_godot(&self) -> Self::ToVia<'_> {
+    fn to_godot(&self) -> Self::Via {
         self.deref().clone()
     }
 }
 
-impl<'v, T: GodotScript> ::godot::prelude::Var for RsRef<T>
+impl<T: GodotScript> ::godot::prelude::Var for RsRef<T>
 where
-    Self: GodotConvert<Via = <Self as ToGodot>::ToVia<'v>>,
-    Self: 'v,
+    Self: GodotConvert,
 {
     fn get_property(&self) -> Self::Via {
         <Self as ToGodot>::to_godot(self)
@@ -193,7 +192,7 @@ impl<T: GodotScript, B: Inherits<T::Base> + Inherits<Object>> CastToScript<T> fo
         self.try_to_script().unwrap_or_else(|err| {
             panic!(
                 "`{}` was assumed to have rust script `{}`, but this was not the case at runtime!\nError: {}",
-                B::class_name(),
+                B::class_id(),
                 T::CLASS_NAME,
                 err,
             );
@@ -204,7 +203,7 @@ impl<T: GodotScript, B: Inherits<T::Base> + Inherits<Object>> CastToScript<T> fo
         self.try_into_script().unwrap_or_else(|err| {
             panic!(
                 "`{}` was assumed to have rust script `{}`, but this was not the case at runtime!\nError: {}",
-                B::class_name(),
+                B::class_id(),
                 T::CLASS_NAME,
                 err
             );

rust-script/src/interface.rs

@@ -35,7 +35,7 @@ impl<T: GodotClass> GodotScriptExport for Gd<T> {
             return custom;
         }
 
-        T::class_name().to_string()
+        T::class_id().to_string()
     }
 
     fn hint(custom: Option<PropertyHint>) -> PropertyHint {