Flatten property::accessor::invalid

Author: Bromeon

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

@@ -1,5 +1,8 @@
 //! 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;
@@ -8,9 +11,10 @@ use crate::object::Ref;
 use crate::private::get_api;
 
 use super::{ClassBuilder, Export};
-use accessor::{Getter, InvalidGetter, InvalidSetter, RawGetter, RawSetter, Setter};
 
 mod accessor;
+mod invalid_accessor;
+
 pub mod hint;
 
 /// Metadata about the exported property.

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/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)]