From 67eab58c247e2ba8f5bf342e5f9f00864eeb1174 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 2 Dec 2023 20:17:05 -0500 Subject: [PATCH] Fix some clippy warnings --- src/cfg.rs | 8 ++++---- src/patch.rs | 6 +++--- src/tex.rs | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cfg.rs b/src/cfg.rs index c0e237a..ee863fd 100644 --- a/src/cfg.rs +++ b/src/cfg.rs @@ -80,8 +80,8 @@ impl ConfigFile { /// Checks if the CFG contains a key named `select_key` pub fn has_key(&self, select_key: &str) -> bool { - for (_, keys) in &self.settings { - for (key, _) in &keys.keys { + for map in self.settings.values() { + for (key, _) in &map.keys { if select_key == key { return true; } @@ -93,7 +93,7 @@ impl ConfigFile { /// Checks if the CFG contains a category named `select_category` pub fn has_category(&self, select_category: &str) -> bool { - for (category, _) in &self.settings { + for category in self.settings.keys() { if select_category == category { return true; } @@ -104,7 +104,7 @@ impl ConfigFile { /// Sets the value to `new_value` of `select_key` pub fn set_value(&mut self, select_key: &str, new_value: &str) { - for (_, keys) in &mut self.settings { + for keys in self.settings.values_mut() { for (key, value) in &mut keys.keys { if select_key == key { *value = new_value.to_string(); diff --git a/src/patch.rs b/src/patch.rs index f297b59..aaa1cb0 100755 --- a/src/patch.rs +++ b/src/patch.rs @@ -332,8 +332,8 @@ const WIPE_BUFFER: [u8; 1 << 16] = [0; 1 << 16]; fn wipe(mut file: &File, length: u32) -> Result<(), PatchError> { let mut length: usize = length as usize; while length > 0 { - let num_bytes = min(WIPE_BUFFER.len(), length as usize); - file.write_all(&WIPE_BUFFER[0..num_bytes as usize])?; + let num_bytes = min(WIPE_BUFFER.len(), length); + file.write_all(&WIPE_BUFFER[0..num_bytes])?; length -= num_bytes; } @@ -585,7 +585,7 @@ pub fn apply_patch(data_dir: &str, patch_path: &str) -> Result<(), PatchError> { new_file.set_len(0)?; } - new_file.seek(SeekFrom::Start(fop.offset as u64))?; + new_file.seek(SeekFrom::Start(fop.offset))?; new_file.write_all(&data)?; } SqpkFileOperation::DeleteFile => { diff --git a/src/tex.rs b/src/tex.rs index 4eff56b..bf4894e 100644 --- a/src/tex.rs +++ b/src/tex.rs @@ -85,8 +85,7 @@ impl Texture { let header = TexHeader::read(&mut cursor).unwrap(); // TODO: Adapted from Lumina, but this really can be written better... - let mut texture_data_size = vec![]; - texture_data_size.resize(min(13, header.mip_levels as usize), 0); + let mut texture_data_size = vec![0; min(13, header.mip_levels as usize)]; let size = texture_data_size.len(); for i in 0..size - 1 { texture_data_size[i] = header.offset_to_surface[i + 1] - header.offset_to_surface[i];