Final fixes after merge

Author: lilizoey

godot-core/src/builtin/array.rs

@@ -28,7 +28,7 @@ use super::meta::{FromGodot, GodotConvert, GodotFfiVariant, GodotType, ToGodot};
 ///
 /// Godot also supports typed arrays, which are also just `Variant` arrays under the hood, but with
 /// runtime checks that no values of the wrong type are put into the array. We represent this as
-/// `Array<T>`, where the type `T` implements `VariantMetadata`, `FromGodot` and `ToGodot`.
+/// `Array<T>`, where the type `T` implements `GodotType`.
 ///
 /// # Reference semantics
 ///
@@ -47,10 +47,10 @@ use super::meta::{FromGodot, GodotConvert, GodotFfiVariant, GodotType, ToGodot};
 
 /// concurrent modification on other threads (e.g. created through GDScript).
 
-// `T` must be restricted to `VariantMetadata` in the type, because `Drop` can only be implemented
+// `T` must be restricted to `GodotType` in the type, because `Drop` can only be implemented
 // for `T: GodotType` because `drop()` requires `sys_mut()`, which is on the `GodotFfi`
 // trait, whose `from_sys_init()` requires `Default`, which is only implemented for `T:
-// VariantMetadata`. Whew. This could be fixed by splitting up `GodotFfi` if desired.
+// GodotType`. Whew. This could be fixed by splitting up `GodotFfi` if desired.
 #[repr(C)]
 pub struct Array<T: GodotType> {
     opaque: sys::types::OpaqueArray,

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

@@ -184,6 +184,26 @@ where
 
         Some(GodotType::from_ffi(ffi))
     }
+
+    fn param_metadata() -> sys::GDExtensionClassMethodArgumentMetadata {
+        T::param_metadata()
+    }
+
+    fn class_name() -> ClassName {
+        T::class_name()
+    }
+
+    fn property_info(property_name: &str) -> PropertyInfo {
+        T::property_info(property_name)
+    }
+
+    fn argument_info(property_name: &str) -> MethodParamOrReturnInfo {
+        T::argument_info(property_name)
+    }
+
+    fn return_info() -> Option<MethodParamOrReturnInfo> {
+        T::return_info()
+    }
 }
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------

godot-core/src/obj/gd.rs

@@ -209,8 +209,7 @@ impl<T: GodotClass> Gd<T> {
     /// ⚠️ Returns the last known, possibly invalid instance ID of this object.
     ///
     /// This function does not check that the returned instance ID points to a valid instance!
-    /// Unless performance is a problem, use [`instance_id()`][Self::instance_id] or
-    /// [`instance_id_or_none()`][Self::instance_id_or_none] instead.
+    /// Unless performance is a problem, use [`instance_id()`][Self::instance_id] instead.
     pub fn instance_id_unchecked(&self) -> InstanceId {
         // SAFETY:
         // A `Gd` can only be created from a non-null `RawGd`. Meaning `raw.instance_id_unchecked()` will
@@ -459,6 +458,10 @@ impl<T: GodotClass> GodotType for Gd<T> {
             Some(Self { raw })
         }
     }
+
+    fn class_name() -> crate::builtin::meta::ClassName {
+        T::class_name()
+    }
 }
 
 impl<T: GodotClass> Clone for Gd<T> {
@@ -540,13 +543,13 @@ impl<T: GodotClass> Eq for Gd<T> {}
 
 impl<T: GodotClass> Display for Gd<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-        engine::display_string(&self, f)
+        engine::display_string(self, f)
     }
 }
 
 impl<T: GodotClass> Debug for Gd<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-        engine::debug_string(&self, f, "Gd")
+        engine::debug_string(self, f, "Gd")
     }
 }
 

godot-macros/src/lib.rs

@@ -474,7 +474,7 @@ pub fn derive_godot_compatible(input: TokenStream) -> TokenStream {
 /// assert_eq!(obj.to_variant(), dict.to_variant());
 /// ```
 ///
-/// You can use the `#[skip]` attribute to ignore a field from being converted to `ToVariant`.
+/// You can use the `#[skip]` attribute to ignore a field from being converted to `ToGodot`.
 #[proc_macro_derive(ToGodot, attributes(variant))]
 pub fn derive_to_godot(input: TokenStream) -> TokenStream {
     translate(input, derive::derive_to_godot)

godot-macros/src/util/mod.rs

@@ -34,12 +34,12 @@ pub fn class_name_obj(class: &impl ToTokens) -> TokenStream {
 
 pub fn property_variant_type(property_type: &impl ToTokens) -> TokenStream {
     let property_type = property_type.to_token_stream();
-    quote! {<<#property_type as ::godot::bind::property::Property>::Intermediate as ::godot::builtin::meta::VariantMetadata>::variant_type()}
+    quote! { <<<#property_type as ::godot::bind::property::Property>::Intermediate as ::godot::builtin::meta::GodotConvert>::Via as ::godot::builtin::meta::GodotType>::Ffi::variant_type() }
 }
 
 pub fn property_variant_class_name(property_type: &impl ToTokens) -> TokenStream {
     let property_type = property_type.to_token_stream();
-    quote! {<<#property_type as ::godot::bind::property::Property>::Intermediate as ::godot::builtin::meta::VariantMetadata>::class_name()}
+    quote! { <<<#property_type as ::godot::bind::property::Property>::Intermediate as ::godot::builtin::meta::GodotConvert>::Via as ::godot::builtin::meta::GodotType>::class_name() }
 }
 
 pub fn bail_fn<R, T>(msg: impl AsRef<str>, tokens: T) -> ParseResult<R>

itest/rust/src/object_tests/property_test.rs

@@ -449,6 +449,6 @@ fn export_resource() {
     class.free();
 }
 
-fn check_property(property: &Dictionary, key: &str, expected: impl ToVariant) {
+fn check_property(property: &Dictionary, key: &str, expected: impl ToGodot) {
     assert_eq!(property.get_or_nil(key), expected.to_variant());
 }