Move 'Export' up from 'property'

Author: Bromeon

gdnative-core/src/nativescript/export.rs

@@ -39,7 +39,7 @@ 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::{user_data::UserData, NativeClass, NativeClassMethods};
 use crate::object::{GodotObject, NewRef, TRef};
 use crate::private::get_api;
@@ -53,7 +53,22 @@ pub mod property;
 pub use self::method::{
     Method, MethodBuilder, RpcMode, ScriptMethod, ScriptMethodAttributes, ScriptMethodFn, Varargs,
 };
-pub use self::property::{Export, ExportInfo, PropertyBuilder, Usage as PropertyUsage};
+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.
 ///

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

@@ -7,30 +7,14 @@ use crate::object::GodotObject;
 use crate::object::Ref;
 use crate::private::get_api;
 
-use super::ClassBuilder;
+use super::{ClassBuilder, Export};
+use accessor::{Getter, InvalidGetter, InvalidSetter, RawGetter, RawSetter, Setter};
 
 mod accessor;
 mod hint;
 
 pub use hint::*;
 
-use accessor::{Getter, InvalidGetter, InvalidSetter, RawGetter, RawSetter, Setter};
-
-/// 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;
-}
-
 /// Metadata about the exported property.
 #[derive(Debug)]
 pub struct ExportInfo {