Move GodotObject, Null, NewRef, Ref, TRef to 'object' module; remove from top-level

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-bindings/src/generated.rs

@@ -9,9 +9,9 @@ use std::sync::Once;
 use gdnative_core::core_types::*;
 use gdnative_core::object::*;
 use gdnative_core::private::get_api;
+use gdnative_core::ref_kind;
 use gdnative_core::sys;
 use gdnative_core::sys::GodotApi;
 use gdnative_core::thread_access;
-use gdnative_core::{ref_kind, GodotResult};
 
 include!(concat!(env!("OUT_DIR"), "/generated.rs"));

gdnative-bindings/src/utils.rs

@@ -2,9 +2,8 @@
 
 use super::generated::{Engine, Node, SceneTree};
 use gdnative_core::nativescript::{NativeClass, RefInstance};
-use gdnative_core::object::SubClass;
+use gdnative_core::object::{SubClass, TRef};
 use gdnative_core::thread_access::Shared;
-use gdnative_core::TRef;
 
 /// Convenience method  to obtain a reference to an "auto-load" node, that is a child of the root
 /// node. Returns `None` if the node does not exist or is not of the correct type.

gdnative-core/src/core_types/byte_array.rs

@@ -5,7 +5,7 @@ pub type ByteArray = TypedArray<u8>;
 
 godot_test!(
     test_byte_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = (0..8).collect::<ByteArray>();
 

gdnative-core/src/core_types/color_array.rs

@@ -6,7 +6,7 @@ pub type ColorArray = TypedArray<Color>;
 
 godot_test!(
     test_color_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = ColorArray::from_vec(vec![
             Color::from_rgb(1.0, 0.0, 0.0),

gdnative-core/src/core_types/dictionary.rs

@@ -12,7 +12,7 @@ use crate::core_types::ToVariant;
 use crate::core_types::ToVariantEq;
 use crate::core_types::Variant;
 use crate::core_types::VariantArray;
-use crate::NewRef;
+use crate::object::NewRef;
 use std::fmt;
 
 use crate::thread_access::*;

gdnative-core/src/core_types/float32_array.rs

@@ -5,7 +5,7 @@ pub type Float32Array = TypedArray<f32>;
 
 godot_test!(
     test_float32_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = (0..8).map(|i| i as f32).collect::<Float32Array>();
 

gdnative-core/src/core_types/int32_array.rs

@@ -5,7 +5,7 @@ pub type Int32Array = TypedArray<i32>;
 
 godot_test!(
     test_int32_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = (0..8).collect::<Int32Array>();
 

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::*;