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

Bromeon · Bromeon · commit 5a947cfafeba · 2021-09-27T15:21:11.000+02:00
diff --git a/gdnative-bindings/src/generated.rs b/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"));
diff --git a/gdnative-bindings/src/utils.rs b/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.
diff --git a/gdnative-core/src/core_types/byte_array.rs b/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>();
 
diff --git a/gdnative-core/src/core_types/color_array.rs b/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),
diff --git a/gdnative-core/src/core_types/dictionary.rs b/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::*;
diff --git a/gdnative-core/src/core_types/float32_array.rs b/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>();
 
diff --git a/gdnative-core/src/core_types/int32_array.rs b/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>();
 
diff --git a/gdnative-core/src/core_types/node_path.rs b/gdnative-core/src/core_types/node_path.rs
@@ -1,7 +1,7 @@
 use crate::core_types::GodotString;
+use crate::object::NewRef;
 use crate::private::get_api;
 use crate::sys;
-use crate::NewRef;
 use std::fmt;
 
 /// A reference-counted relative or absolute path in a scene tree, for use with `Node.get_node()` and similar
diff --git a/gdnative-core/src/core_types/string.rs b/gdnative-core/src/core_types/string.rs
@@ -1,6 +1,6 @@
+use crate::object::NewRef;
 use crate::private::get_api;
 use crate::sys;
-use crate::NewRef;
 
 use std::cmp::Ordering;
 use std::convert::TryFrom;
diff --git a/gdnative-core/src/core_types/string_array.rs b/gdnative-core/src/core_types/string_array.rs
@@ -6,7 +6,7 @@ pub type StringArray = TypedArray<GodotString>;
 
 godot_test!(
     test_string_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = StringArray::from_vec(vec![
             GodotString::from("foo"),
diff --git a/gdnative-core/src/core_types/typed_array.rs b/gdnative-core/src/core_types/typed_array.rs
@@ -6,8 +6,8 @@ use gdnative_impl_proc_macros as macros;
 
 use crate::core_types::access::{Aligned, MaybeUnaligned};
 use crate::core_types::{Color, GodotString, VariantArray, Vector2, Vector3};
+use crate::object::NewRef;
 use crate::private::get_api;
-use crate::NewRef;
 
 /// A reference-counted CoW typed vector using Godot's pool allocator, generic over possible
 /// element types.
diff --git a/gdnative-core/src/core_types/variant_array.rs b/gdnative-core/src/core_types/variant_array.rs
@@ -9,7 +9,7 @@ use crate::sys;
 use crate::core_types::OwnedToVariant;
 use crate::core_types::ToVariant;
 use crate::core_types::Variant;
-use crate::NewRef;
+use crate::object::NewRef;
 
 use crate::thread_access::*;
 
diff --git a/gdnative-core/src/core_types/vector2_array.rs b/gdnative-core/src/core_types/vector2_array.rs
@@ -6,7 +6,7 @@ pub type Vector2Array = TypedArray<Vector2>;
 
 godot_test!(
     test_vector2_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = Vector2Array::from_vec(vec![
             Vector2::new(1.0, 2.0),
diff --git a/gdnative-core/src/core_types/vector3_array.rs b/gdnative-core/src/core_types/vector3_array.rs
@@ -6,7 +6,7 @@ pub type Vector3Array = TypedArray<Vector3>;
 
 godot_test!(
     test_vector3_array_access {
-        use crate::NewRef as _;
+        use crate::object::NewRef as _;
 
         let arr = Vector3Array::from_vec(vec![
             Vector3::new(1.0, 2.0, 3.0),
diff --git a/gdnative-core/src/lib.rs b/gdnative-core/src/lib.rs
@@ -42,7 +42,6 @@ mod init;
 pub mod nativescript;
 
 pub mod log;
-mod new_ref;
 pub mod object;
 pub mod ref_kind;
 pub mod thread_access;
@@ -56,8 +55,6 @@ pub mod private;
 //
 
 pub use init::{InitializeInfo, TerminateInfo};
-pub use new_ref::NewRef;
-pub use object::{GodotObject, Null, Ref, TRef};
 
 #[deprecated(since = "0.10", note = "use core_types::GodotResult")]
 #[doc(hidden)]
diff --git a/gdnative-core/src/nativescript/init.rs b/gdnative-core/src/nativescript/init.rs
@@ -41,13 +41,13 @@ use std::marker::PhantomData;
 use std::ptr;
 
 use crate::core_types::{GodotString, Variant};
-use crate::nativescript::NativeClass;
-use crate::nativescript::NativeClassMethods;
-use crate::nativescript::UserData;
+use crate::nativescript::{NativeClass, NativeClassMethods, UserData};
+use crate::object::{GodotObject, NewRef, TRef};
 use crate::private::get_api;
 
 use super::class_registry;
 use super::emplace;
+
 pub mod method;
 pub mod property;
 
diff --git a/gdnative-core/src/nativescript/init/property/accessor.rs b/gdnative-core/src/nativescript/init/property/accessor.rs
@@ -8,8 +8,7 @@ use crate::nativescript::user_data::UserData;
 use crate::nativescript::Map;
 use crate::nativescript::MapMut;
 use crate::nativescript::NativeClass;
-use crate::object::{GodotObject, RawObject};
-use crate::*;
+use crate::object::{GodotObject, RawObject, TRef};
 
 mod invalid;
 
diff --git a/gdnative-core/src/object/mod.rs b/gdnative-core/src/object/mod.rs
@@ -6,20 +6,21 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::ptr::NonNull;
 
+#[cfg(feature = "nativescript")]
+use crate::nativescript::{Instance, NativeClass, RefInstance};
 use crate::private::{get_api, ManuallyManagedClassPlaceholder, ReferenceCountedClassPlaceholder};
 use crate::ref_kind::{ManuallyManaged, RefCounted, RefKind};
 use crate::sys;
 use crate::thread_access::{
     LocalThreadAccess, NonUniqueThreadAccess, Shared, ThreadAccess, ThreadLocal, Unique,
 };
 
-#[cfg(feature = "nativescript")]
-use crate::nativescript::{Instance, NativeClass, RefInstance};
+pub use self::new_ref::NewRef;
+pub use self::raw::RawObject;
 
+mod new_ref;
 mod raw;
 
-pub use self::raw::RawObject;
-
 /// Trait for Godot API objects. This trait is sealed, and implemented for generated wrapper
 /// types.
 ///
diff --git a/gdnative-core/src/object/new_ref.rs b/gdnative-core/src/object/new_ref.rs
diff --git a/gdnative/src/prelude.rs b/gdnative/src/prelude.rs
@@ -1,5 +1,5 @@
 pub use gdnative_core::core_types::{
-    self, GodotError, Aabb, Basis, ByteArray, Color, ColorArray, Dictionary, Float32Array,
+    self, Aabb, Basis, ByteArray, Color, ColorArray, Dictionary, Float32Array, GodotError,
     GodotString, Int32Array, NodePath, Plane, Quat, Rect2, Rid, StringArray, StringName, Transform,
     Transform2D, TypedArray, Variant, VariantArray, VariantDispatch, VariantOperator, VariantType,
     Vector2, Vector2Array, Vector3, Vector3Array,
@@ -10,12 +10,11 @@ pub use gdnative_core::core_types::{
 };
 
 pub use gdnative_core::object::{
-    AsArg, GodotObject, Instanciable, Null, QueueFree, Ref, SubClass, TRef,
+    AsArg, GodotObject, Instanciable, NewRef, Null, QueueFree, Ref, SubClass, TRef,
 };
 
 pub use gdnative_core::ref_kind::{ManuallyManaged, RefCounted};
 pub use gdnative_core::thread_access::{Shared, ThreadLocal, Unique};
-pub use gdnative_core::NewRef;
 
 pub use gdnative_core::nativescript::{
     self,
