Do not re-export nativescript::{init, user_data}

Author: Bromeon

gdnative-core/src/nativescript/class.rs

@@ -4,7 +4,7 @@ use crate::core_types::{
     FromVariant, FromVariantError, GodotString, OwnedToVariant, ToVariant, Variant,
 };
 use crate::nativescript::init::ClassBuilder;
-use crate::nativescript::{Map, MapMut, MapOwned, UserData};
+use crate::nativescript::user_data::{Map, MapMut, MapOwned, UserData};
 use crate::object::bounds::{
     AssumeSafeLifetime, LifetimeConstraint, RefImplBound, SafeAsRaw, SafeDeref,
 };

gdnative-core/src/nativescript/init.rs

@@ -41,7 +41,7 @@ use std::marker::PhantomData;
 use std::ptr;
 
 use crate::core_types::{GodotString, Variant};
-use crate::nativescript::{NativeClass, NativeClassMethods, UserData};
+use crate::nativescript::{user_data::UserData, NativeClass, NativeClassMethods};
 use crate::object::{GodotObject, NewRef, TRef};
 use crate::private::get_api;
 

gdnative-core/src/nativescript/init/property/accessor.rs

@@ -4,9 +4,7 @@ use std::marker::PhantomData;
 use std::ptr::NonNull;
 
 use crate::core_types::{FromVariant, ToVariant, Variant};
-use crate::nativescript::user_data::UserData;
-use crate::nativescript::Map;
-use crate::nativescript::MapMut;
+use crate::nativescript::user_data::{Map, MapMut, UserData};
 use crate::nativescript::NativeClass;
 use crate::object::{GodotObject, RawObject, TRef};
 

gdnative-core/src/nativescript/mod.rs

@@ -11,5 +11,3 @@ pub mod type_tag;
 pub mod user_data;
 
 pub use class::*;
-pub use init::*;
-pub use user_data::{Map, MapMut, MapOwned, UserData};

gdnative/src/prelude.rs

@@ -20,10 +20,12 @@ pub use gdnative_core::object::{
 
 pub use gdnative_core::nativescript::{
     self,
-    class::{Instance, RefInstance},
-    init::{ClassBuilder, InitHandle, Method, MethodBuilder, Signal, SignalArgument},
+    init::{
+        ClassBuilder, ExportInfo, InitHandle, Method, MethodBuilder, PropertyUsage, Signal,
+        SignalArgument,
+    },
     user_data::{self, Aether, ArcData, LocalCellData, MutexData, RwLockData},
-    ExportInfo, NativeClass, NativeClassMethods, PropertyUsage,
+    Instance, NativeClass, NativeClassMethods, RefInstance,
 };
 
 pub use gdnative_core::{