Adjust imports in derive macros, examples and UI tests

Author: Bromeon

examples/dodge_the_creeps/src/main_scene.rs

@@ -140,7 +140,7 @@ impl Main {
 ///   scene as the root. For instance Spatial is used for this example.
 fn instance_scene<Root>(scene: &Ref<PackedScene, Shared>) -> Ref<Root, Unique>
 where
-    Root: gdnative::GodotObject<RefKind = ManuallyManaged> + SubClass<Node>,
+    Root: gdnative::object::GodotObject<RefKind = ManuallyManaged> + SubClass<Node>,
 {
     let scene = unsafe { scene.assume_safe() };
 

examples/scene_create/src/lib.rs

@@ -116,7 +116,7 @@ pub fn load_scene(path: &str) -> Option<Ref<PackedScene, ThreadLocal>> {
 ///   scene as the root. For instance Spatial is used for this example.
 fn instance_scene<Root>(scene: &PackedScene) -> Result<Ref<Root, Unique>, ManageErrs>
 where
-    Root: gdnative::GodotObject<RefKind = ManuallyManaged> + SubClass<Node>,
+    Root: gdnative::object::GodotObject<RefKind = ManuallyManaged> + SubClass<Node>,
 {
     let instance = scene
         .instance(PackedScene::GEN_EDIT_STATE_DISABLED)

gdnative-core/src/core_types/mod.rs

@@ -44,7 +44,7 @@ pub use rid::*;
 pub use string::*;
 pub use string_array::*;
 pub use transform2d::*;
-pub use typed_array::{Element, TypedArray};
+pub use typed_array::*; // TODO rename Element to something more specific
 pub use variant::*;
 pub use variant_array::*;
 pub use vector2::*;

gdnative-core/src/lib.rs

@@ -25,6 +25,7 @@
 
 #[doc(hidden)]
 pub extern crate gdnative_sys as sys;
+
 #[doc(hidden)]
 pub extern crate libc;
 
@@ -41,6 +42,7 @@ mod init;
 #[cfg(feature = "nativescript")]
 pub mod nativescript;
 
+#[doc(hidden)]
 pub mod log;
 pub mod object;
 pub mod ref_kind;

gdnative-derive/src/native_script.rs

@@ -29,7 +29,7 @@ pub(crate) fn impl_empty_nativeclass(derive_input: &DeriveInput) -> TokenStream2
             fn class_name() -> &'static str {
                 unimplemented!()
             }
-            fn init(owner: ::gdnative::TRef<'_, Self::Base, Shared>) -> Self {
+            fn init(owner: ::gdnative::object::TRef<'_, Self::Base, Shared>) -> Self {
                 unimplemented!()
             }
         }
@@ -83,13 +83,13 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
                     #with_default
                     #with_hint
                     #with_usage
-                    .with_ref_getter(|this: &#name, _owner: ::gdnative::TRef<Self::Base>| {
+                    .with_ref_getter(|this: &#name, _owner: ::gdnative::object::TRef<Self::Base>| {
                         #before_get
                         let res = &this.#ident;
                         #after_get
                         res
                     })
-                    .with_setter(|this: &mut #name, _owner: ::gdnative::TRef<Self::Base>, v| {
+                    .with_setter(|this: &mut #name, _owner: ::gdnative::object::TRef<Self::Base>, v| {
                         #before_set
                         this.#ident = v;
                         #after_set
@@ -105,7 +105,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
             None
         } else {
             Some(quote! {
-                fn init(owner: ::gdnative::TRef<Self::Base>) -> Self {
+                fn init(owner: ::gdnative::object::TRef<Self::Base>) -> Self {
                     Self::new(::gdnative::nativescript::OwnerArg::from_safe_ref(owner))
                 }
             })

gdnative/src/lib.rs

@@ -51,13 +51,14 @@
 
 // TODO: add logo using #![doc(html_logo_url = "https://<url>")]
 
-// Workaround: rustdoc currently shows hidden items in the original crate when they are
-//             re-exported. Manually re-exporting the public items works around that.
+// Workaround (rustdoc 1.55):
+// Items, which are #[doc(hidden)] in their original crate and re-exported with a wildcard, lose
+// their hidden status. Re-exporting them manually and hiding the wildcard solves this.
 #[doc(inline)]
 pub use gdnative_core::{
     core_types, godot_dbg, godot_error, godot_gdnative_init, godot_gdnative_terminate, godot_init,
     godot_nativescript_init, godot_print, godot_warn, godot_wrap_method, nativescript, object,
-    ref_kind, thread_access, GodotObject, GodotResult, NewRef, Null, Ref, TRef,
+    ref_kind, thread_access,
 };
 
 #[doc(hidden)]

gdnative/tests/ui/derive_fail_methods_missing_new.stderr

@@ -10,7 +10,7 @@ error[E0599]: no function or associated item named `new` found for struct `Foo`
   = help: items from traits can only be used if the trait is implemented and in scope
   = note: the following traits define an item `new`, perhaps you need to implement one of them:
           candidate #1: `UserData`
-          candidate #2: `gdnative::GodotObject`
+          candidate #2: `gdnative::prelude::GodotObject`
           candidate #3: `PtrWrapper`
           candidate #4: `glam::core::traits::matrix::Matrix2x2`
           candidate #5: `glam::core::traits::vector::MaskVector2`