Rename nativescript -> export; move out nativescript::export

Author: Bromeon

examples/array_export/src/lib.rs

@@ -1,4 +1,4 @@
-use gdnative::nativescript::export::hint::{ArrayHint, IntHint, RangeHint};
+use gdnative::export::hint::{ArrayHint, IntHint, RangeHint};
 use gdnative::prelude::*;
 
 #[derive(NativeClass)]

examples/spinning_cube/src/lib.rs

@@ -1,7 +1,7 @@
 use gdnative::api::MeshInstance;
 use gdnative::prelude::*;
 
-use gdnative::nativescript::export::hint::{EnumHint, IntHint, StringHint};
+use gdnative::export::hint::{EnumHint, IntHint, StringHint};
 
 #[derive(gdnative::derive::NativeClass)]
 #[inherit(MeshInstance)]

gdnative-async/src/method.rs

@@ -5,9 +5,9 @@ use std::sync::Arc;
 use futures_task::{LocalFutureObj, LocalSpawn, SpawnError};
 
 use gdnative_core::core_types::{ToVariant, Variant};
+use gdnative_core::export::{Method, Varargs};
+use gdnative_core::export::{NativeClass, RefInstance};
 use gdnative_core::log::{self, Site};
-use gdnative_core::nativescript::export::{Method, Varargs};
-use gdnative_core::nativescript::{NativeClass, RefInstance};
 use gdnative_core::object::ownership::Shared;
 
 use crate::rt::Context;

gdnative-async/src/rt.rs

@@ -4,8 +4,8 @@ use gdnative_bindings::Object;
 use gdnative_core::object::SubClass;
 
 use gdnative_core::core_types::{GodotError, Variant};
-use gdnative_core::nativescript::export::InitHandle;
-use gdnative_core::nativescript::{Instance, RefInstance};
+use gdnative_core::export::InitHandle;
+use gdnative_core::export::{Instance, RefInstance};
 use gdnative_core::object::ownership::Shared;
 use gdnative_core::object::TRef;
 

gdnative-async/src/rt/bridge.rs

@@ -5,10 +5,10 @@ use parking_lot::Mutex;
 
 use gdnative_bindings::{Object, Reference};
 use gdnative_core::core_types::{GodotError, Variant, VariantArray};
+use gdnative_core::export::user_data::{ArcData, Map};
+use gdnative_core::export::{ClassBuilder, Method, Varargs};
+use gdnative_core::export::{Instance, NativeClass, NativeClassMethods, RefInstance};
 use gdnative_core::godot_site;
-use gdnative_core::nativescript::export::{ClassBuilder, Method, Varargs};
-use gdnative_core::nativescript::user_data::{ArcData, Map};
-use gdnative_core::nativescript::{Instance, NativeClass, NativeClassMethods, RefInstance};
 use gdnative_core::object::{ownership::Shared, TRef};
 
 use crate::future::Resume;

gdnative-async/src/rt/func_state.rs

@@ -1,11 +1,11 @@
 use gdnative_bindings::Reference;
 use gdnative_core::core_types::{ToVariant, Variant, VariantType};
-use gdnative_core::godot_site;
-use gdnative_core::nativescript::export::{
+use gdnative_core::export::user_data::{LocalCellData, Map, MapMut};
+use gdnative_core::export::{
     ClassBuilder, ExportInfo, PropertyUsage, Signal, SignalArgument, StaticArgs, StaticArgsMethod,
 };
-use gdnative_core::nativescript::user_data::{LocalCellData, Map, MapMut};
-use gdnative_core::nativescript::{Instance, NativeClass, NativeClassMethods, RefInstance};
+use gdnative_core::export::{Instance, NativeClass, NativeClassMethods, RefInstance};
+use gdnative_core::godot_site;
 use gdnative_core::object::ownership::{Shared, Unique};
 use gdnative_derive::FromVarargs;
 

gdnative-bindings/src/utils.rs

@@ -1,7 +1,7 @@
 //! Utility functions and extension traits that depend on generated bindings
 
 use super::generated::{Engine, Node, SceneTree};
-use gdnative_core::nativescript::{NativeClass, RefInstance};
+use gdnative_core::export::{NativeClass, RefInstance};
 use gdnative_core::object::ownership::Shared;
 use gdnative_core::object::{SubClass, TRef};
 

gdnative-core/src/nativescript/class.rs renamed to gdnative-core/src/export/class.rs

@@ -3,8 +3,8 @@ use std::ptr::NonNull;
 use crate::core_types::{
     FromVariant, FromVariantError, GodotString, OwnedToVariant, ToVariant, Variant,
 };
-use crate::nativescript::export::ClassBuilder;
-use crate::nativescript::user_data::{Map, MapMut, MapOwned, UserData};
+use crate::export::user_data::{Map, MapMut, MapOwned, UserData};
+use crate::export::ClassBuilder;
 use crate::object::bounds::{
     AssumeSafeLifetime, LifetimeConstraint, RefImplBound, SafeAsRaw, SafeDeref,
 };
@@ -746,7 +746,7 @@ fn try_get_user_data_ptr<T: NativeClass>(owner: &RawObject<T::Base>) -> Option<*
             return None;
         }
 
-        if !crate::nativescript::type_tag::check::<T>(type_tag) {
+        if !crate::export::type_tag::check::<T>(type_tag) {
             return None;
         }
 

gdnative-core/src/nativescript/export.rs renamed to gdnative-core/src/export/class_builder.rs

@@ -37,38 +37,12 @@ use std::ffi::CString;
 use std::marker::PhantomData;
 use std::ptr;
 
-use crate::core_types::{GodotString, ToVariant, Variant};
-use crate::nativescript::{class_registry, emplace};
-use crate::nativescript::{user_data::UserData, NativeClass, NativeClassMethods};
+use crate::core_types::{GodotString, Variant};
+use crate::export::user_data::UserData;
+use crate::export::*;
 use crate::object::{GodotObject, NewRef, RawObject, TRef};
 use crate::private::get_api;
 
-pub use method::*;
-pub use property::*;
-
-mod method;
-mod property;
-
-//pub use self::method::{
-//    Method, MethodBuilder, RpcMode, ScriptMethod, ScriptMethodAttributes, ScriptMethodFn, Varargs,
-//};
-//pub use self::property::{ExportInfo, PropertyBuilder, Usage as PropertyUsage};
-
-/// Trait for exportable types.
-pub trait Export: ToVariant {
-    /// A type-specific hint type that is valid for the type being exported.
-    ///
-    /// If this type shows up as `NoHint`, a private, uninhabitable type indicating
-    /// that there are no hints available for the time being, users *must* use `None`
-    /// for properties of this type. This ensures that it will not be a breaking change
-    /// to add a hint for the type later, since it supports no operations and cannot
-    /// be named directly in user code.
-    type Hint;
-
-    /// Returns `ExportInfo` given an optional typed hint.
-    fn export_info(hint: Option<Self::Hint>) -> ExportInfo;
-}
-
 /// A handle that can register new classes to the engine during initialization.
 ///
 /// See [`godot_nativescript_init`](macro.godot_nativescript_init.html) and
@@ -221,7 +195,7 @@ impl InitHandle {
             (get_api().godot_nativescript_set_type_tag)(
                 self.handle as *mut _,
                 class_name.as_ptr() as *const _,
-                crate::nativescript::type_tag::create::<C>(),
+                crate::export::type_tag::create::<C>(),
             );
 
             let builder = ClassBuilder {
@@ -240,8 +214,8 @@ impl InitHandle {
 
 #[derive(Debug)]
 pub struct ClassBuilder<C> {
-    init_handle: *mut libc::c_void,
-    class_name: CString,
+    pub(super) init_handle: *mut libc::c_void,
+    pub(super) class_name: CString,
     _marker: PhantomData<C>,
 }
 
@@ -306,7 +280,7 @@ impl<C: NativeClass> ClassBuilder<C> {
     /// Basic usage:
     /// ```
     /// use gdnative::prelude::*;
-    /// use gdnative::nativescript::export::{RpcMode, Varargs};
+    /// use gdnative::export::{RpcMode, Varargs};
     ///
     /// #[derive(NativeClass)]
     /// #[register_with(Self::my_register)]

gdnative-core/src/nativescript/class_registry.rs renamed to gdnative-core/src/export/class_registry.rs

@@ -1,4 +1,4 @@
-use crate::nativescript::NativeClass;
+use crate::export::NativeClass;
 use once_cell::sync::Lazy;
 use parking_lot::RwLock;
 use std::any::TypeId;