Rename init -> export

Bromeon · Bromeon · commit 77abb708194f · 2021-10-11T22:25:18.000+02:00
diff --git a/examples/array_export/src/lib.rs b/examples/array_export/src/lib.rs
@@ -1,4 +1,4 @@
-use gdnative::nativescript::init::property::hint::{ArrayHint, IntHint, RangeHint};
+use gdnative::nativescript::export::property::hint::{ArrayHint, IntHint, RangeHint};
 use gdnative::prelude::*;
 
 #[derive(NativeClass)]
diff --git a/examples/spinning_cube/src/lib.rs b/examples/spinning_cube/src/lib.rs
@@ -1,7 +1,7 @@
 use gdnative::api::MeshInstance;
 use gdnative::prelude::*;
 
-use gdnative::nativescript::init::property::{EnumHint, IntHint, StringHint};
+use gdnative::nativescript::export::property::{EnumHint, IntHint, StringHint};
 
 #[derive(gdnative::derive::NativeClass)]
 #[inherit(MeshInstance)]
diff --git a/gdnative-core/src/nativescript/class.rs b/gdnative-core/src/nativescript/class.rs
@@ -3,7 +3,7 @@ use std::ptr::NonNull;
 use crate::core_types::{
     FromVariant, FromVariantError, GodotString, OwnedToVariant, ToVariant, Variant,
 };
-use crate::nativescript::init::ClassBuilder;
+use crate::nativescript::export::ClassBuilder;
 use crate::nativescript::user_data::{Map, MapMut, MapOwned, UserData};
 use crate::object::bounds::{
     AssumeSafeLifetime, LifetimeConstraint, RefImplBound, SafeAsRaw, SafeDeref,
diff --git a/gdnative-core/src/nativescript/export.rs b/gdnative-core/src/nativescript/export.rs
@@ -292,7 +292,7 @@ impl<C: NativeClass> ClassBuilder<C> {
     /// Basic usage:
     /// ```
     /// use gdnative::prelude::*;
-    /// use gdnative::nativescript::init::{RpcMode, Varargs};
+    /// use gdnative::nativescript::export::{RpcMode, Varargs};
     ///
     /// #[derive(NativeClass)]
     /// #[register_with(Self::my_register)]
diff --git a/gdnative-core/src/nativescript/export/method.rs b/gdnative-core/src/nativescript/export/method.rs
diff --git a/gdnative-core/src/nativescript/export/property.rs b/gdnative-core/src/nativescript/export/property.rs
diff --git a/gdnative-core/src/nativescript/export/property/accessor.rs b/gdnative-core/src/nativescript/export/property/accessor.rs
diff --git a/gdnative-core/src/nativescript/export/property/accessor/invalid.rs b/gdnative-core/src/nativescript/export/property/accessor/invalid.rs
diff --git a/gdnative-core/src/nativescript/export/property/hint.rs b/gdnative-core/src/nativescript/export/property/hint.rs
@@ -16,7 +16,7 @@ use super::{Export, ExportInfo};
 /// Basic usage:
 ///
 /// ```rust
-/// use gdnative_core::nativescript::init::property::hint::RangeHint;
+/// use gdnative_core::nativescript::export::property::hint::RangeHint;
 ///
 /// let hint: RangeHint<f64> = RangeHint::new(0.0, 20.0).or_greater();
 /// ```
@@ -110,7 +110,7 @@ where
 /// Basic usage:
 ///
 /// ```rust
-/// use gdnative_core::nativescript::init::property::hint::EnumHint;
+/// use gdnative_core::nativescript::export::property::hint::EnumHint;
 ///
 /// let hint = EnumHint::new(vec!["Foo".into(), "Bar".into(), "Baz".into()]);
 /// ```
diff --git a/gdnative-core/src/nativescript/macros.rs b/gdnative-core/src/nativescript/macros.rs
@@ -16,14 +16,14 @@
 #[macro_export]
 macro_rules! godot_nativescript_init {
     () => {
-        fn godot_nativescript_init_empty(_init: $crate::nativescript::init::InitHandle) {}
+        fn godot_nativescript_init_empty(_init: $crate::nativescript::export::InitHandle) {}
         $crate::godot_nativescript_init!(godot_nativescript_init_empty);
     };
     ($callback:ident) => {
         $crate::godot_nativescript_init!($callback as godot_nativescript_init);
     };
     (_ as $fn_name:ident) => {
-        fn godot_nativescript_init_empty(_init: $crate::nativescript::init::InitHandle) {}
+        fn godot_nativescript_init_empty(_init: $crate::nativescript::export::InitHandle) {}
         $crate::godot_nativescript_init!(godot_nativescript_init_empty as $fn_name);
     };
     ($callback:ident as $fn_name:ident) => {
@@ -36,7 +36,7 @@ macro_rules! godot_nativescript_init {
             }
 
             let __result = ::std::panic::catch_unwind(|| {
-                $callback($crate::nativescript::init::InitHandle::new(handle));
+                $callback($crate::nativescript::export::InitHandle::new(handle));
             });
 
             if __result.is_err() {
@@ -108,7 +108,7 @@ macro_rules! godot_wrap_method_inner {
             }
 
             #[allow(unused_variables, unused_assignments, unused_mut)]
-            impl $crate::nativescript::init::method::StaticArgsMethod<$type_name> for ThisMethod {
+            impl $crate::nativescript::export::method::StaticArgsMethod<$type_name> for ThisMethod {
                 type Args = Args;
                 fn call(
                     &self,
@@ -139,7 +139,7 @@ macro_rules! godot_wrap_method_inner {
                 }
             }
 
-            $crate::nativescript::init::method::StaticArgs::new(ThisMethod)
+            $crate::nativescript::export::method::StaticArgs::new(ThisMethod)
         }
     };
 }
diff --git a/gdnative-core/src/nativescript/mod.rs b/gdnative-core/src/nativescript/mod.rs
@@ -16,7 +16,7 @@ mod macros;
 pub(crate) mod class_registry;
 pub(crate) mod type_tag;
 
-pub mod init;
+pub mod export;
 pub mod profiler;
 pub mod user_data;
 
diff --git a/gdnative-derive/src/lib.rs b/gdnative-derive/src/lib.rs
@@ -49,7 +49,7 @@ mod variant;
 /// }
 /// impl gdnative::nativescript::NativeClassMethods for Foo {
 ///     fn register(builder: &ClassBuilder<Self>) {
-///         use gdnative::nativescript::init::*;
+///         use gdnative::nativescript::export::*;
 ///         builder.build_method("foo", gdnative::godot_wrap_method!(Foo, fn foo(&self, _owner: &Reference, bar: i64) -> i64))
 ///             .with_rpc_mode(RpcMode::Disabled)
 ///             .done_stateless();
@@ -163,7 +163,7 @@ pub fn profiled(meta: TokenStream, input: TokenStream) -> TokenStream {
 ///
 /// ```
 /// use gdnative::prelude::*;
-/// use gdnative::nativescript::init::property::{RangeHint, FloatHint};
+/// use gdnative::nativescript::export::property::{RangeHint, FloatHint};
 ///
 /// #[derive(NativeClass)]
 /// #[inherit(Reference)]
diff --git a/gdnative-derive/src/methods.rs b/gdnative-derive/src/methods.rs
@@ -146,8 +146,8 @@ pub(crate) fn derive_methods(item_impl: ItemImpl) -> TokenStream2 {
 
         #derived
         impl gdnative::nativescript::NativeClassMethods for #class_name {
-            fn register(#builder: &::gdnative::nativescript::init::ClassBuilder<Self>) {
-                use gdnative::nativescript::init::*;
+            fn register(#builder: &::gdnative::nativescript::export::ClassBuilder<Self>) {
+                use gdnative::nativescript::export::*;
 
                 #(#methods)*
             }
diff --git a/gdnative-derive/src/native_script.rs b/gdnative-derive/src/native_script.rs
@@ -56,7 +56,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
             let with_hint = config.hint.map(|hint_fn| quote!(.with_hint(#hint_fn())));
 
             let with_usage = if config.no_editor {
-                Some(quote!(.with_usage(::gdnative::nativescript::init::property::Usage::NOEDITOR)))
+                Some(quote!(.with_usage(::gdnative::nativescript::export::property::Usage::NOEDITOR)))
             } else {
                 None
             };
@@ -123,7 +123,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
 
                 #init
 
-                fn register_properties(builder: &::gdnative::nativescript::init::ClassBuilder<Self>) {
+                fn register_properties(builder: &::gdnative::nativescript::export::ClassBuilder<Self>) {
                     #(#properties)*;
                     #register_callback
                 }
diff --git a/gdnative-derive/src/varargs.rs b/gdnative-derive/src/varargs.rs
@@ -35,10 +35,10 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
             Fields::Unit => {
                 return Ok(quote! {
                     #derived
-                    impl #generics ::gdnative::nativescript::init::method::FromVarargs for #ident #generics #where_clause {
+                    impl #generics ::gdnative::nativescript::export::method::FromVarargs for #ident #generics #where_clause {
                         fn read<'a>(
-                            #input_ident: &mut ::gdnative::nativescript::init::method::Varargs<'a>,
-                        ) -> Result<Self, Vec<::gdnative::nativescript::init::method::ArgumentError<'a>>> {
+                            #input_ident: &mut ::gdnative::nativescript::export::method::Varargs<'a>,
+                        ) -> Result<Self, Vec<::gdnative::nativescript::export::method::ArgumentError<'a>>> {
                             Ok(#ident)
                         }
                     }
@@ -113,10 +113,10 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
 
         Ok(quote! {
             #derived
-            impl #generics ::gdnative::nativescript::init::method::FromVarargs for #ident #generics #where_clause {
+            impl #generics ::gdnative::nativescript::export::method::FromVarargs for #ident #generics #where_clause {
                 fn read<'a>(
-                    #input_ident: &mut ::gdnative::nativescript::init::method::Varargs<'a>,
-                ) -> Result<Self, Vec<::gdnative::nativescript::init::method::ArgumentError<'a>>> {
+                    #input_ident: &mut ::gdnative::nativescript::export::method::Varargs<'a>,
+                ) -> Result<Self, Vec<::gdnative::nativescript::export::method::ArgumentError<'a>>> {
                     let mut __errors = Vec::new();
 
                     #(
diff --git a/gdnative/src/prelude.rs b/gdnative/src/prelude.rs
@@ -17,7 +17,10 @@ pub use gdnative_core::object::{
 
 pub use gdnative_core::nativescript::{
     self,
-    init::{ClassBuilder, InitHandle, Method, MethodBuilder, Signal, SignalArgument, ExportInfo, PropertyUsage},
+    export::{
+        ClassBuilder, ExportInfo, InitHandle, Method, MethodBuilder, PropertyUsage, Signal,
+        SignalArgument,
+    },
     user_data::{self, Aether, ArcData, LocalCellData, MutexData, RwLockData},
     Instance, NativeClass, NativeClassMethods, RefInstance,
 };
diff --git a/gdnative/tests/ui/derive_property_basic.rs b/gdnative/tests/ui/derive_property_basic.rs
@@ -1,4 +1,4 @@
-use gdnative::nativescript::init::property::*;
+use gdnative::nativescript::export::property::*;
 use gdnative::prelude::*;
 
 fn test_hint() -> StringHint {
diff --git a/test/src/test_register.rs b/test/src/test_register.rs
@@ -1,6 +1,6 @@
 use std::ops::Add;
 
-use gdnative::nativescript::init::method::{StaticArgs, StaticArgsMethod};
+use gdnative::nativescript::export::method::{StaticArgs, StaticArgsMethod};
 use gdnative::prelude::*;
 
 pub(crate) fn run_tests() -> bool {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use gdnative::nativescript::init::property::hint::{ArrayHint, IntHint, RangeHint};`
	`1`	`+use gdnative::nativescript::export::property::hint::{ArrayHint, IntHint, RangeHint};`
`2`	`2`	`use gdnative::prelude::*;`
`3`	`3`
`4`	`4`	`#[derive(NativeClass)]`