diff --git a/src/chardat.rs b/src/chardat.rs index 7953a94..ebc7ad9 100644 --- a/src/chardat.rs +++ b/src/chardat.rs @@ -1,10 +1,7 @@ use crate::gamedata::MemoryBuffer; -use crate::sha1::Sha1; -use binrw::{binread, binrw}; +use binrw::binread; use binrw::BinRead; -use std::fs::read; -use std::io::{Cursor, Seek, SeekFrom}; -use std::ops::Sub; +use std::io::Cursor; use crate::race::{Gender, Race, Subrace}; fn convert_dat_race(x: u8) -> Race { diff --git a/src/cmp.rs b/src/cmp.rs index 27b83ce..1659b14 100644 --- a/src/cmp.rs +++ b/src/cmp.rs @@ -1,8 +1,6 @@ use crate::gamedata::MemoryBuffer; -use crate::sha1::Sha1; -use binrw::{binread, binrw}; +use binrw::binrw; use binrw::BinRead; -use std::fs::read; use std::io::{Cursor, Seek, SeekFrom}; #[binrw] @@ -41,14 +39,14 @@ impl CMP { pub fn from_existing(buffer: &MemoryBuffer) -> Option { let mut cursor = Cursor::new(buffer); - cursor.seek(SeekFrom::Start(0x2a800)); + cursor.seek(SeekFrom::Start(0x2a800)).unwrap(); let rem = buffer.len() - cursor.position() as usize; let entries = rem / std::mem::size_of::(); let mut parameters = vec![]; - for i in 0..entries { + for _ in 0..entries { parameters.push(RacialScalingParameters::read(&mut cursor).unwrap()); } diff --git a/src/gamedata.rs b/src/gamedata.rs index 44ba884..c7396f2 100755 --- a/src/gamedata.rs +++ b/src/gamedata.rs @@ -10,7 +10,7 @@ use crate::sqpack::calculate_hash; use std::fs; use std::fs::{DirEntry, ReadDir}; use std::path::PathBuf; -use tracing::{debug, error, info, span, warn, Level}; +use tracing::debug; /// Framework for operating on game data. pub struct GameData { diff --git a/src/macros.rs b/src/macros.rs index b333e6c..d932f40 100755 --- a/src/macros.rs +++ b/src/macros.rs @@ -1,5 +1,5 @@ /// Creates a enum list of combined race identifiers. For example, (Hyur, Midlander, Male) becomes a new variant called HyurMidlanderMale. -#[macro_export(crate)] +#[macro_export] macro_rules! define_race_enum { ( pub enum $name:ident {