Reduce nesting in nativescript::export module

Changes:
* Move out symbols from export::{method, property}
* Flatten property::accessor::invalid
* Rename Usage -> PropertyUsage (like the already re-exported version)

Author: Bromeon

examples/array_export/src/lib.rs

@@ -1,4 +1,4 @@
-use gdnative::nativescript::export::property::hint::{ArrayHint, IntHint, RangeHint};
+use gdnative::nativescript::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::property::{EnumHint, IntHint, StringHint};
+use gdnative::nativescript::export::hint::{EnumHint, IntHint, StringHint};
 
 #[derive(gdnative::derive::NativeClass)]
 #[inherit(MeshInstance)]

gdnative-async/src/rt/bridge.rs

@@ -6,8 +6,7 @@ use parking_lot::Mutex;
 use gdnative_bindings::{Object, Reference};
 use gdnative_core::core_types::{GodotError, Variant, VariantArray};
 use gdnative_core::godot_site;
-use gdnative_core::nativescript::export::method::{Method, Varargs};
-use gdnative_core::nativescript::export::ClassBuilder;
+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};

gdnative-async/src/rt/func_state.rs

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

gdnative-core/src/nativescript/export.rs

@@ -33,27 +33,41 @@
 // Temporary for unsafe method registration
 #![allow(deprecated)]
 
-use crate::*;
-
 use std::ffi::CString;
 use std::marker::PhantomData;
 use std::ptr;
 
-use crate::core_types::{GodotString, Variant};
+use crate::core_types::{GodotString, ToVariant, Variant};
+use crate::nativescript::{class_registry, emplace};
 use crate::nativescript::{user_data::UserData, NativeClass, NativeClassMethods};
-use crate::object::{GodotObject, NewRef, TRef};
+use crate::object::{GodotObject, NewRef, RawObject, TRef};
 use crate::private::get_api;
 
-use super::class_registry;
-use super::emplace;
+pub use method::*;
+pub use property::*;
+
+mod method;
+mod property;
 
-pub mod method;
-pub mod property;
+//pub use self::method::{
+//    Method, MethodBuilder, RpcMode, ScriptMethod, ScriptMethodAttributes, ScriptMethodFn, Varargs,
+//};
+//pub use self::property::{ExportInfo, PropertyBuilder, Usage as PropertyUsage};
 
-pub use self::method::{
-    Method, MethodBuilder, RpcMode, ScriptMethod, ScriptMethodAttributes, ScriptMethodFn, Varargs,
-};
-pub use self::property::{Export, 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.
 ///
@@ -124,7 +138,7 @@ impl InitHandle {
                         }
                     };
 
-                    let owner = match object::RawObject::<C::Base>::try_from_sys_ref(this) {
+                    let owner = match RawObject::<C::Base>::try_from_sys_ref(this) {
                         Some(owner) => owner,
                         None => {
                             godot_error!(

gdnative-core/src/nativescript/export/property.rs

@@ -1,35 +1,21 @@
 //! Property registration.
 
+use accessor::{Getter, RawGetter, RawSetter, Setter};
+use invalid_accessor::{InvalidGetter, InvalidSetter};
+
 use crate::core_types::*;
 use crate::nativescript::{Instance, NativeClass};
 use crate::object::ownership::Shared;
 use crate::object::GodotObject;
 use crate::object::Ref;
 use crate::private::get_api;
 
-use super::ClassBuilder;
+use super::{ClassBuilder, Export};
 
 mod accessor;
-pub mod hint;
-
-pub use hint::*;
-
-use accessor::{Getter, InvalidGetter, InvalidSetter, RawGetter, RawSetter, Setter};
+mod invalid_accessor;
 
-/// 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;
-}
+pub mod hint;
 
 /// Metadata about the exported property.
 #[derive(Debug)]
@@ -73,7 +59,7 @@ pub struct PropertyBuilder<'a, C, T: Export, S = InvalidSetter<'a>, G = InvalidG
     getter: G,
     default: Option<T>,
     hint: Option<T::Hint>,
-    usage: Usage,
+    usage: PropertyUsage,
     class_builder: &'a ClassBuilder<C>,
 }
 
@@ -91,7 +77,7 @@ where
             getter: InvalidGetter::new(name),
             default: None,
             hint: None,
-            usage: Usage::DEFAULT,
+            usage: PropertyUsage::DEFAULT,
             class_builder,
         }
     }
@@ -283,14 +269,14 @@ where
 
     /// Sets a property usage.
     #[inline]
-    pub fn with_usage(mut self, usage: Usage) -> Self {
+    pub fn with_usage(mut self, usage: PropertyUsage) -> Self {
         self.usage = usage;
         self
     }
 }
 
 bitflags::bitflags! {
-    pub struct Usage: u32 {
+    pub struct PropertyUsage: u32 {
         const STORAGE = sys::godot_property_usage_flags_GODOT_PROPERTY_USAGE_STORAGE as u32;
         const EDITOR = sys::godot_property_usage_flags_GODOT_PROPERTY_USAGE_EDITOR as u32;
         const NETWORK = sys::godot_property_usage_flags_GODOT_PROPERTY_USAGE_NETWORK as u32;
@@ -315,7 +301,7 @@ bitflags::bitflags! {
     }
 }
 
-impl Usage {
+impl PropertyUsage {
     #[inline]
     pub fn to_sys(self) -> sys::godot_property_usage_flags {
         self.bits() as sys::godot_property_usage_flags
@@ -474,7 +460,7 @@ mod impl_export {
     }
 
     impl Export for VariantArray<Shared> {
-        type Hint = ArrayHint;
+        type Hint = hint::ArrayHint;
 
         #[inline]
         fn export_info(hint: Option<Self::Hint>) -> ExportInfo {

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

@@ -8,10 +8,6 @@ use crate::nativescript::user_data::{Map, MapMut, UserData};
 use crate::nativescript::NativeClass;
 use crate::object::{GodotObject, RawObject, TRef};
 
-mod invalid;
-
-pub use self::invalid::{InvalidGetter, InvalidSetter};
-
 /// Trait for raw property setters.
 ///
 /// This is an internal interface. User code should not use this directly.

gdnative-core/src/nativescript/export/property/hint.rs

@@ -16,7 +16,7 @@ use super::{Export, ExportInfo};
 /// Basic usage:
 ///
 /// ```rust
-/// use gdnative_core::nativescript::export::property::hint::RangeHint;
+/// use gdnative_core::nativescript::export::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::export::property::hint::EnumHint;
+/// use gdnative_core::nativescript::export::hint::EnumHint;
 ///
 /// let hint = EnumHint::new(vec!["Foo".into(), "Bar".into(), "Baz".into()]);
 /// ```

gdnative-core/src/nativescript/export/property/accessor/invalid.rs renamed to gdnative-core/src/nativescript/export/property/invalid_accessor.rs

@@ -4,9 +4,8 @@ use std::mem;
 
 use crate::core_types::{FromVariant, ToVariant, Variant};
 use crate::nativescript::NativeClass;
-use crate::*;
 
-use super::{RawGetter, RawSetter};
+use super::accessor::{RawGetter, RawSetter};
 
 /// Default setter used for a new property indicating that no valid setter is present. Outputs errors when invoked.
 #[derive(Debug)]

gdnative-core/src/nativescript/macros.rs

@@ -108,7 +108,7 @@ macro_rules! godot_wrap_method_inner {
             }
 
             #[allow(unused_variables, unused_assignments, unused_mut)]
-            impl $crate::nativescript::export::method::StaticArgsMethod<$type_name> for ThisMethod {
+            impl $crate::nativescript::export::StaticArgsMethod<$type_name> for ThisMethod {
                 type Args = Args;
                 fn call(
                     &self,
@@ -139,7 +139,7 @@ macro_rules! godot_wrap_method_inner {
                 }
             }
 
-            $crate::nativescript::export::method::StaticArgs::new(ThisMethod)
+            $crate::nativescript::export::StaticArgs::new(ThisMethod)
         }
     };
 }