redstrate/ireko
1
Fork 0
Code Activity Actions

Remove NameProperty

Browse source 
This has the same memory layout as StringProperty, and we don't need to
duplicate the work.
This commit is contained in:
Joshua Goins 2025-02-23 15:54:17 -05:00
parent 21ab9f2cb0
commit fe2cb4e624
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib.rs
View file

@ -4,7 +4,6 @@ mod common;
pub mod float_property;
pub mod int_property;
pub mod map_property;
pub mod name_property;
pub mod set_property;
pub mod str_property;
pub mod struct_property;
@ -17,7 +16,6 @@ use crate::bool_property::BoolProperty;
use crate::float_property::FloatProperty;
use crate::int_property::IntProperty;
use crate::map_property::MapProperty;
use crate::name_property::NameProperty;
use crate::set_property::SetProperty;
use crate::str_property::StrProperty;
use crate::struct_property::StructProperty;
@ -37,7 +35,7 @@ pub enum Property {
#[br(magic = b"StrProperty\0")]
String(StrProperty),
#[br(magic = b"NameProperty\0")]
Name(NameProperty),
Name(StrProperty),
#[br(magic = b"ArrayProperty\0")]
Array(ArrayProperty),
#[br(magic = b"MapProperty\0")]
@ -52,7 +50,7 @@ pub enum Property {
#[br(import { magic: &str })]
pub enum StringBasedProperty {
#[br(pre_assert("NameProperty" == magic))]
Name(NameProperty),
Name(StrProperty),
#[br(pre_assert("StructProperty" == magic))]
Struct(StructProperty),
#[br(pre_assert("FloatProperty" == magic))]

14
src/name_property.rs
View file

@ -1,14 +0,0 @@
use binrw::binrw;
#[binrw]
#[derive(Debug)]
pub struct NameProperty {
#[br(temp)]
#[bw(ignore)]
#[br(pad_after = 5)]
pub property_name_length: u32,
#[br(count = property_name_length)]
#[bw(map = |x : &String | x.as_bytes())]
#[br(map = | x: Vec<u8> | String::from_utf8(x).unwrap().trim_matches(char::from(0)).to_string())]
pub property_name: String,
}