From e79480794f2e3e35ed4d00a82c2efc8d5e138a31 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Fri, 30 Sep 2022 16:43:19 -0400 Subject: [PATCH] Use HashSet for cells and in Plugin public API --- src/parser.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/parser.rs b/src/parser.rs index a4de1b4..85b77b2 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -25,9 +25,9 @@ pub struct Plugin<'a> { /// Parsed [TES4 header record](https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/TES4) with metadata about the plugin pub header: PluginHeader<'a>, /// Parsed [WRLD records](https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/WRLD) contained in the plugin - pub worlds: Vec, + pub worlds: HashSet, /// Parsed [CELL records](https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/CELL) contained in the plugin - pub cells: Vec, + pub cells: HashSet, } /// Parsed [TES4 header record](https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/TES4) @@ -42,7 +42,7 @@ pub struct PluginHeader<'a> { } /// Parsed [CELL records](https://en.uesp.net/wiki/Skyrim_Mod:Mod_File_Format/CELL) -#[derive(Debug, Clone, PartialEq, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize)] pub struct Cell { pub form_id: u32, pub editor_id: Option, @@ -223,7 +223,7 @@ pub fn parse_plugin(input: &[u8]) -> Result { .map_err(|_err| anyhow!("Failed to parse plugin header and find CELL data"))?; let decompressed_cells = decompress_cells(unparsed_cells)?; - let mut cells = Vec::new(); + let mut cells = HashSet::new(); for decompressed_cell in decompressed_cells { let (_, cell) = parse_cell( &decompressed_cell.data, @@ -232,12 +232,12 @@ pub fn parse_plugin(input: &[u8]) -> Result { decompressed_cell.world_form_id, ) .unwrap(); - cells.push(cell); + cells.insert(cell); } Ok(Plugin { header, - worlds: Vec::from_iter(worlds), + worlds, cells, }) }