From 1869c312681a84e82ea42795da57f08a7ecdcf21 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Fri, 13 Oct 2023 16:59:39 -0400
Subject: [PATCH] Fix some warnings

---
 src/cfg.rs  | 10 +++++-----
 src/pbd.rs  | 14 +++++++-------
 src/shpk.rs |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cfg.rs b/src/cfg.rs
index cee876d..fc96a3f 100644
--- a/src/cfg.rs
+++ b/src/cfg.rs
@@ -79,8 +79,8 @@ impl ConfigFile {
     }
 
     pub fn has_key(&self, select_key: &str) -> bool {
-        for (category, keys) in &self.settings {
-            for (key, value) in &keys.keys {
+        for (_, keys) in &self.settings {
+            for (key, _) in &keys.keys {
                 if select_key == key {
                     return true;
                 }
@@ -91,7 +91,7 @@ impl ConfigFile {
     }
 
     pub fn has_category(&self, select_category: &str) -> bool {
-        for (category, keys) in &self.settings {
+        for (category, _) in &self.settings {
             if select_category == category {
                 return true;
             }
@@ -101,7 +101,7 @@ impl ConfigFile {
     }
 
     pub fn set_value(&mut self, select_key: &str, new_value: &str) {
-        for (category, keys) in &mut self.settings {
+        for (_, keys) in &mut self.settings {
             for (key, value) in &mut keys.keys {
                 if select_key == key {
                     *value = new_value.to_string();
@@ -114,7 +114,7 @@ impl ConfigFile {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{read, write};
+    use std::fs::read;
     use std::path::PathBuf;
 
     use super::*;
diff --git a/src/pbd.rs b/src/pbd.rs
index 520afa4..451d90d 100644
--- a/src/pbd.rs
+++ b/src/pbd.rs
@@ -3,7 +3,7 @@
 
 use std::io::{Cursor, Seek, SeekFrom};
 
-use binrw::{BinRead, BinReaderExt, BinWrite};
+use binrw::{BinRead, BinReaderExt};
 use binrw::binrw;
 use crate::ByteSpan;
 
@@ -86,22 +86,22 @@ impl PreBoneDeformer {
         let mut cursor = Cursor::new(&self.header.raw_data);
 
         loop {
-            cursor.seek(SeekFrom::Start(item.data_offset as u64));
+            cursor.seek(SeekFrom::Start(item.data_offset as u64)).ok()?;
             let bone_name_count = cursor.read_le::<u32>().unwrap() as usize;
 
             let string_offsets_base = item.data_offset as usize + core::mem::size_of::<u32>();
 
-            cursor.seek(SeekFrom::Start(string_offsets_base as u64));
+            cursor.seek(SeekFrom::Start(string_offsets_base as u64)).ok()?;
             let mut strings_offset = vec![];
-            for i in 0..bone_name_count {
+            for _ in 0..bone_name_count {
                 strings_offset.push(cursor.read_le::<u16>().unwrap());
             }
 
             let matrices_base = string_offsets_base + (bone_name_count + bone_name_count % 2) * 2;
-            cursor.seek(SeekFrom::Start(matrices_base as u64));
+            cursor.seek(SeekFrom::Start(matrices_base as u64)).ok()?;
 
             let mut matrices = vec![];
-            for i in 0..bone_name_count {
+            for _ in 0..bone_name_count {
                 matrices.push(cursor.read_le::<[f32; 12]>().unwrap());
             }
 
@@ -110,7 +110,7 @@ impl PreBoneDeformer {
 
                 let mut string = String::new();
 
-                cursor.seek(SeekFrom::Start(string_offset as u64));
+                cursor.seek(SeekFrom::Start(string_offset as u64)).ok()?;
                 let mut next_char = cursor.read_le::<u8>().unwrap() as char;
                 while next_char != '\0' {
                     string.push(next_char);
diff --git a/src/shpk.rs b/src/shpk.rs
index a5e2467..266d408 100644
--- a/src/shpk.rs
+++ b/src/shpk.rs
@@ -95,11 +95,11 @@ impl ShaderPackage {
         cursor.seek(SeekFrom::Current((shpk_header.c1 as u64 * 0x08) as i64)).ok()?;
 
         for _ in 0..shpk_header.scalar_parameter_count {
-            let header = ParameterHeader::read_le(&mut cursor);
+            let _ = ParameterHeader::read_le(&mut cursor).ok()?;
         }
 
         for _ in 0..shpk_header.resource_parameter_count {
-            let header = ParameterHeader::read_le(&mut cursor);
+            let _ = ParameterHeader::read_le(&mut cursor).ok()?;
         }
 
         // shader bytecode