diff --git a/paramacro/src/lib.rs b/paramacro/src/lib.rs index 259f965..e8a35bf 100644 --- a/paramacro/src/lib.rs +++ b/paramacro/src/lib.rs @@ -54,8 +54,8 @@ pub fn serialized_struct(_metadata: TokenStream, input: TokenStream) // Add "None" field let none_field_stream = quote! { #[br(temp)] - #[bw(calc = crate::property::generic_property::GenericProperty { property_name: "None".to_string(), type_name: "".to_string(), key: None } )] - none_field: crate::property::generic_property::GenericProperty + #[bw(calc = crate::property::GenericProperty { property_name: "None".to_string(), type_name: "".to_string(), key: None } )] + none_field: crate::property::GenericProperty }; let buffer = ::syn::parse::Parser::parse2( syn::Field::parse_named, diff --git a/src/property/array_property.rs b/src/property/array_property.rs index ed81b2d..c484759 100644 --- a/src/property/array_property.rs +++ b/src/property/array_property.rs @@ -141,6 +141,7 @@ fn calc_key_data_size_in_bytes(key_data: &ArrayKeyData) -> u32 { } } +/// An array. #[binrw] #[derive(Debug)] pub struct ArrayProperty { diff --git a/src/property/bool_property.rs b/src/property/bool_property.rs index 2a3267a..b09dfc5 100644 --- a/src/property/bool_property.rs +++ b/src/property/bool_property.rs @@ -3,6 +3,7 @@ use binrw::binrw; use super::PropertyBase; +/// A boolean. #[binrw] #[derive(Debug)] pub struct BoolProperty { diff --git a/src/property/enum_property.rs b/src/property/enum_property.rs index 9768f02..047278c 100644 --- a/src/property/enum_property.rs +++ b/src/property/enum_property.rs @@ -3,6 +3,7 @@ use binrw::binrw; use super::PropertyBase; +/// A enum. #[binrw] #[derive(Debug)] pub struct EnumProperty { diff --git a/src/property/float_property.rs b/src/property/float_property.rs index 87233bf..440d0dd 100644 --- a/src/property/float_property.rs +++ b/src/property/float_property.rs @@ -2,6 +2,7 @@ use binrw::binrw; use super::PropertyBase; +/// A float. #[binrw] #[derive(Debug)] pub struct FloatProperty { diff --git a/src/property/generic_property.rs b/src/property/generic_property.rs index dceabf4..9c186ae 100644 --- a/src/property/generic_property.rs +++ b/src/property/generic_property.rs @@ -5,6 +5,7 @@ use crate::{ save_object::generic::Property, }; +/// A generic property that has no name or type requirements. #[binrw] #[derive(Debug)] pub struct GenericProperty { diff --git a/src/property/int_property.rs b/src/property/int_property.rs index ebf4a72..feead97 100644 --- a/src/property/int_property.rs +++ b/src/property/int_property.rs @@ -2,6 +2,7 @@ use binrw::binrw; use super::PropertyBase; +/// A integer. #[binrw] #[derive(Debug)] pub struct IntProperty { diff --git a/src/property/map_property.rs b/src/property/map_property.rs index c8b8e89..6cc26fd 100644 --- a/src/property/map_property.rs +++ b/src/property/map_property.rs @@ -5,7 +5,7 @@ use crate::{ structure::{Struct, guid::Guid}, }; -use super::{PropertyBase, generic_property::GenericProperty}; +use super::{GenericProperty, PropertyBase}; // parse until we can't parse no more. kind of a hack for how we run into the end of Persistent.Sav #[binrw::parser(reader, endian)] @@ -270,6 +270,7 @@ fn calc_entry_size_in_bytes(prop: &MapProperty) -> u32 { size } +/// A map. #[binrw] #[derive(Debug)] pub struct MapProperty { diff --git a/src/property/mod.rs b/src/property/mod.rs index 360b601..7eb42dc 100644 --- a/src/property/mod.rs +++ b/src/property/mod.rs @@ -1,14 +1,32 @@ pub mod array_property; -pub mod bool_property; -pub mod enum_property; -pub mod float_property; -pub mod generic_property; -pub mod int_property; + +mod bool_property; +pub use self::bool_property::BoolProperty; + +mod enum_property; +pub use self::enum_property::EnumProperty; + +mod float_property; +pub use float_property::FloatProperty; + +mod generic_property; +pub use self::generic_property::GenericProperty; + +mod int_property; +pub use self::int_property::IntProperty; + pub mod map_property; -pub mod name_property; + +mod name_property; +pub use self::name_property::NameProperty; + pub mod set_property; -pub mod str_property; -pub mod struct_property; + +mod str_property; +pub use self::str_property::StrProperty; + +mod struct_property; +pub use self::struct_property::StructProperty; pub(crate) trait PropertyBase { fn type_name() -> &'static str; diff --git a/src/property/name_property.rs b/src/property/name_property.rs index 285d8ed..0524ca4 100644 --- a/src/property/name_property.rs +++ b/src/property/name_property.rs @@ -3,6 +3,7 @@ use binrw::binrw; use super::PropertyBase; +/// A name. #[binrw] #[derive(Debug)] pub struct NameProperty { diff --git a/src/property/set_property.rs b/src/property/set_property.rs index 0667f0f..9577699 100644 --- a/src/property/set_property.rs +++ b/src/property/set_property.rs @@ -2,8 +2,7 @@ use crate::common::{read_string_with_length, write_string_with_length}; use binrw::{BinRead, BinResult, binrw}; use super::{ - PropertyBase, - generic_property::GenericProperty, + GenericProperty, PropertyBase, map_property::{KeyType, MapSubStrProperty}, }; @@ -73,6 +72,7 @@ fn custom_parser( Ok(result) } +/// A set. #[binrw] #[derive(Debug)] pub struct SetProperty { diff --git a/src/property/str_property.rs b/src/property/str_property.rs index fc74834..38a89ad 100644 --- a/src/property/str_property.rs +++ b/src/property/str_property.rs @@ -3,6 +3,7 @@ use binrw::binrw; use super::PropertyBase; +/// A string. #[binrw] #[derive(Debug)] pub struct StrProperty { diff --git a/src/property/struct_property.rs b/src/property/struct_property.rs index c73c54d..5f10b45 100644 --- a/src/property/struct_property.rs +++ b/src/property/struct_property.rs @@ -4,6 +4,7 @@ use crate::{ }; use binrw::binrw; +/// A structure. #[binrw] #[derive(Debug)] pub struct StructProperty { diff --git a/src/save_object/generic.rs b/src/save_object/generic.rs index 419f867..1263496 100644 --- a/src/save_object/generic.rs +++ b/src/save_object/generic.rs @@ -3,9 +3,8 @@ use binrw::{BinRead, BinResult, BinWrite, binrw}; use crate::{ common::{read_string_with_length, write_string_with_length}, property::{ - array_property::ArrayProperty, bool_property::BoolProperty, float_property::FloatProperty, - int_property::IntProperty, map_property::MapProperty, name_property::NameProperty, - set_property::SetProperty, str_property::StrProperty, struct_property::StructProperty, + BoolProperty, FloatProperty, IntProperty, NameProperty, StrProperty, StructProperty, + array_property::ArrayProperty, map_property::MapProperty, set_property::SetProperty, }, }; diff --git a/src/save_object/localprofile.rs b/src/save_object/localprofile.rs index 567d9ee..bfb7646 100644 --- a/src/save_object/localprofile.rs +++ b/src/save_object/localprofile.rs @@ -1,7 +1,4 @@ -use crate::property::{ - bool_property::BoolProperty, int_property::IntProperty, map_property::MapProperty, - str_property::StrProperty, -}; +use crate::property::{BoolProperty, IntProperty, StrProperty, map_property::MapProperty}; #[paramacro::serialized_struct("Transform")] #[derive(Debug)] diff --git a/src/save_object/persistent.rs b/src/save_object/persistent.rs index 386caf0..2238fa5 100644 --- a/src/save_object/persistent.rs +++ b/src/save_object/persistent.rs @@ -2,9 +2,8 @@ use binrw::binrw; use crate::{ property::{ - array_property::ArrayProperty, bool_property::BoolProperty, int_property::IntProperty, - map_property::MapProperty, name_property::NameProperty, set_property::SetProperty, - str_property::StrProperty, + BoolProperty, IntProperty, NameProperty, StrProperty, array_property::ArrayProperty, + map_property::MapProperty, set_property::SetProperty, }, structure::{ build_data::DABuildDataStruct, da_tuning_point_data::DATuningPointData, diff --git a/src/save_object/slot.rs b/src/save_object/slot.rs index 5c2c5a0..c5518df 100644 --- a/src/save_object/slot.rs +++ b/src/save_object/slot.rs @@ -1,8 +1,5 @@ use crate::{ - property::{ - bool_property::BoolProperty, float_property::FloatProperty, int_property::IntProperty, - name_property::NameProperty, str_property::StrProperty, - }, + property::{BoolProperty, FloatProperty, IntProperty, NameProperty, StrProperty}, structure::{ da_load_option::DALoadOptionStruct, datetime::DateTimeStruct, save_slot_info::SaveSlotInfoStruct, diff --git a/src/structure/build_data.rs b/src/structure/build_data.rs index 57a0fd5..8a2db16 100644 --- a/src/structure/build_data.rs +++ b/src/structure/build_data.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use crate::property::str_property::StrProperty; +use crate::property::StrProperty; use super::{ da_assemble_id_data::DAAssembleIdDataStruct, diff --git a/src/structure/da_customize_asset_id.rs b/src/structure/da_customize_asset_id.rs index 2eafcd2..10d024e 100644 --- a/src/structure/da_customize_asset_id.rs +++ b/src/structure/da_customize_asset_id.rs @@ -1,4 +1,4 @@ -use crate::property::bool_property::BoolProperty; +use crate::property::BoolProperty; use super::{ da_humanoid_coloring_data::DAHumanoidColoringDataStruct, diff --git a/src/structure/da_humanoid_figure_data.rs b/src/structure/da_humanoid_figure_data.rs index 28bca98..1c44db3 100644 --- a/src/structure/da_humanoid_figure_data.rs +++ b/src/structure/da_humanoid_figure_data.rs @@ -1,4 +1,4 @@ -use crate::property::float_property::FloatProperty; +use crate::property::FloatProperty; #[paramacro::serialized_struct("DAHumanoidFigureData")] #[derive(Debug)] diff --git a/src/structure/da_load_option.rs b/src/structure/da_load_option.rs index aec498e..aeb09f3 100644 --- a/src/structure/da_load_option.rs +++ b/src/structure/da_load_option.rs @@ -1,4 +1,4 @@ -use crate::property::int_property::IntProperty; +use crate::property::IntProperty; #[paramacro::serialized_struct("DALoadOption")] #[derive(Debug)] diff --git a/src/structure/da_module_item_data.rs b/src/structure/da_module_item_data.rs index 478254b..8ee57a8 100644 --- a/src/structure/da_module_item_data.rs +++ b/src/structure/da_module_item_data.rs @@ -1,4 +1,4 @@ -use crate::property::int_property::IntProperty; +use crate::property::IntProperty; #[paramacro::serialized_struct("DAModuleItemData")] #[derive(Debug)] diff --git a/src/structure/da_trigger_data.rs b/src/structure/da_trigger_data.rs index 48c17fe..0e2b805 100644 --- a/src/structure/da_trigger_data.rs +++ b/src/structure/da_trigger_data.rs @@ -1,4 +1,4 @@ -use crate::property::enum_property::EnumProperty; +use crate::property::EnumProperty; #[paramacro::serialized_struct("DATriggerData")] #[derive(Debug)] diff --git a/src/structure/da_tuning_point_data.rs b/src/structure/da_tuning_point_data.rs index 9cf030c..39a5ab1 100644 --- a/src/structure/da_tuning_point_data.rs +++ b/src/structure/da_tuning_point_data.rs @@ -1,4 +1,4 @@ -use crate::property::int_property::IntProperty; +use crate::property::IntProperty; #[paramacro::serialized_struct("DATuningPointData")] #[derive(Debug)] diff --git a/src/structure/primary_asset_id.rs b/src/structure/primary_asset_id.rs index e4ec90d..90be7ae 100644 --- a/src/structure/primary_asset_id.rs +++ b/src/structure/primary_asset_id.rs @@ -1,4 +1,4 @@ -use crate::property::name_property::NameProperty; +use crate::property::NameProperty; use super::primary_asset_type::PrimaryAssetTypeStruct; diff --git a/src/structure/primary_asset_type.rs b/src/structure/primary_asset_type.rs index b871a49..980912d 100644 --- a/src/structure/primary_asset_type.rs +++ b/src/structure/primary_asset_type.rs @@ -1,4 +1,4 @@ -use crate::property::name_property::NameProperty; +use crate::property::NameProperty; #[paramacro::serialized_struct("PrimaryAssetType")] #[derive(Debug)] diff --git a/src/structure/save_slot_info.rs b/src/structure/save_slot_info.rs index 3265b24..4c6cc02 100644 --- a/src/structure/save_slot_info.rs +++ b/src/structure/save_slot_info.rs @@ -1,6 +1,4 @@ -use crate::property::{ - array_property::ArrayProperty, name_property::NameProperty, str_property::StrProperty, -}; +use crate::property::{NameProperty, StrProperty, array_property::ArrayProperty}; use super::datetime::DateTimeStruct;