chore: Fix "some" clippy lints

eurochef-edb/src/array.rs

@@ -35,7 +35,7 @@ impl<T: BinRead> EXGeoHashArray<T> {
     }
 
     pub fn data(&self) -> &Vec<T> {
-        return &self.data;
+        &self.data
     }
 }
 
@@ -161,7 +161,7 @@ impl<T: BinRead> EXRelArray<T> {
     }
 
     pub fn data(&self) -> &Vec<T> {
-        return &self.data;
+        &self.data
     }
 }
 

eurochef-edb/src/edb.rs

@@ -24,10 +24,8 @@ impl<R: Read + Seek + Sized> DatabaseReader for R {
             let ptr: *mut EdbFile = transmute(self as *mut _);
 
             // Check alignment and safety marker
-            if (transmute::<_, usize>(ptr) & 0x7) == 0
-                && (*ptr).safety_marker == EdbFile::SAFETY_MARKER
-            {
-                Some(transmute(ptr))
+            if (ptr as usize & 0x7) == 0 && (*ptr).safety_marker == EdbFile::SAFETY_MARKER {
+                Some(&mut *ptr)
             } else {
                 if cfg!(debug_assertions) {
                     warn!("Couldn't verify EdbFile marker and alignment!");
@@ -76,7 +74,7 @@ impl EdbFile {
             ));
         }
 
-        if version < 182 || version > 263 {
+        if !(182..=263).contains(&version) {
             return Err(crate::error::EurochefError::Unsupported(
                 crate::error::UnsupportedError::Version(version),
             ));
@@ -109,10 +107,8 @@ impl EdbFile {
     pub fn add_reference(&mut self, file: Hashcode, reference: Hashcode) {
         if file == u32::MAX || reference.is_local() {
             self.add_reference_internal(reference);
-        } else {
-            if !self.external_references.contains(&(file, reference)) {
-                self.external_references.push((file, reference))
-            }
+        } else if !self.external_references.contains(&(file, reference)) {
+            self.external_references.push((file, reference))
         }
     }
 

eurochef-edb/src/entity.rs

@@ -139,7 +139,7 @@ impl EXGeoEntity {
             EXGeoEntity::Mesh(e) => Some(&e.data.base),
             EXGeoEntity::Split(e) => Some(&e.base),
             EXGeoEntity::MapZone(e) => Some(&e.base),
-            EXGeoEntity::Instance(e) => Some(&e),
+            EXGeoEntity::Instance(e) => Some(e),
             EXGeoEntity::UnknownType(_e) => None,
         }
     }

eurochef-edb/src/map.rs

@@ -228,7 +228,7 @@ impl BinRead for EXGeoTriggerEngineOptions {
         let mut res: EXGeoTriggerEngineOptions = Default::default();
 
         const FLAG_BASE: usize = 24;
-        if trig_flags.is_set(FLAG_BASE + 0) {
+        if trig_flags.is_set(FLAG_BASE) {
             res.visual_object = Some(reader.read_type(endian)?);
         }
         if trig_flags.is_set(FLAG_BASE + 1) {

eurochef-edb/src/versions.rs

@@ -30,7 +30,7 @@ pub enum Platform {
 }
 
 pub fn transform_windows_path<P: AsRef<str>>(path: P) -> String {
-    path.as_ref().replace("\\", "/")
+    path.as_ref().replace('\\', "/")
 }
 
 impl Platform {
@@ -47,12 +47,15 @@ impl Platform {
 
         // swy: the magic value is the four-byte GEOM tag, for big endian the G '0x47' shows first,
         //      otherwise it's the M (0x4D) of MOEG; looks reversed to humans, little-endian
-        let endian = if reader.read_ne::<u8>().ok()? == b'G' /* 0x47 */ {
+        let endian = if reader.read_ne::<u8>().ok()? == b'G'
+        /* 0x47 */
+        {
             Endian::Big
-        } else { // 'M' /* 0x4D */
+        } else {
+            // 'M' /* 0x4D */
             Endian::Little
         };
-        
+
         reader.rewind().ok();
         let header = reader.read_type::<EXGeoHeader>(endian).unwrap();
 

eurochef-filelist/src/path.rs

@@ -1,34 +1,34 @@
 pub fn unscramble_filename_v7(file_index: u32, bytes: &mut [u8]) {
-    for i in 0..bytes.len() {
-        bytes[i] = (bytes[i] as u32)
+    for (i, b) in bytes.iter_mut().enumerate() {
+        *b = (*b as u32)
             .wrapping_add(0x16)
             .wrapping_sub(file_index)
             .wrapping_sub(i as u32) as u8;
 
-        if bytes[i] == 0 {
+        if *b == 0 {
             break;
         }
     }
 }
 
 // TODO: This should take a string and output a Cow<[u8]> to ensure null-termination
 pub fn scramble_filename_v7(file_index: u32, bytes: &mut [u8]) {
-    for i in 0..bytes.len() {
-        bytes[i] = (bytes[i] as u32)
+    for (i, b) in bytes.iter_mut().enumerate() {
+        *b = (*b as u32)
             .wrapping_sub(0x16)
             .wrapping_add(file_index)
             .wrapping_add(i as u32) as u8;
     }
 }
 
 pub fn unscramble_filename_v10(file_index: u32, bytes: &mut [u8]) {
-    for i in 0..bytes.len() {
-        bytes[i] = (bytes[i] as u32)
+    for (i, b) in bytes.iter_mut().enumerate() {
+        *b = (*b as u32)
             .wrapping_sub(0x6a)
             .wrapping_sub(file_index * 4)
             .wrapping_sub(i as u32 * 4) as u8;
 
-        if bytes[i] == 0 {
+        if *b == 0 {
             break;
         }
     }

eurochef-filelist/src/v4.rs

@@ -44,16 +44,15 @@ impl EXFileList4 {
         }
 
         // FIXME: If the strings arent encoded linearly this will be a bit inefficient
-        for (_, (start, end)) in filename_offsets
+        for (start, end) in filename_offsets
             .iter()
             .chain([res.header.filesize as u64].iter())
             .tuple_windows()
-            .enumerate()
         {
             let size = end - start;
             let mut data = vec![0u8; size as usize];
             reader.seek(std::io::SeekFrom::Start(*start))?;
-            reader.read(&mut data)?;
+            reader.read_exact(&mut data)?;
 
             let null_pos = data.iter().position(|&p| p == 0).unwrap_or(data.len());
             res.filenames
@@ -64,16 +63,16 @@ impl EXFileList4 {
     }
 }
 
-impl Into<UXFileList> for EXFileList4 {
-    fn into(self) -> UXFileList {
+impl From<EXFileList4> for UXFileList {
+    fn from(val: EXFileList4) -> Self {
         UXFileList {
             num_filelists: None,
             build_type: None,
-            endian: self.endian,
-            files: self
+            endian: val.endian,
+            files: val
                 .filenames
                 .into_iter()
-                .zip(self.header.fileinfo)
+                .zip(val.header.fileinfo)
                 .map(|(filename, info)| {
                     (
                         filename,

eurochef-filelist/src/v5.rs

@@ -55,7 +55,7 @@ impl EXFileList5 {
             let size = end - start;
             let mut data = vec![0u8; size as usize];
             reader.seek(std::io::SeekFrom::Start(*start))?;
-            reader.read(&mut data)?;
+            reader.read_exact(&mut data)?;
 
             if res.header.version >= 7 {
                 unscramble_filename_v7(i as u32, &mut data);
@@ -71,16 +71,16 @@ impl EXFileList5 {
 }
 
 // TODO: Make a trait for filelists bundling both the read and from/into functions so that they can be used genericly
-impl Into<UXFileList> for EXFileList5 {
-    fn into(self) -> UXFileList {
+impl From<EXFileList5> for UXFileList {
+    fn from(val: EXFileList5) -> Self {
         UXFileList {
-            num_filelists: Some(self.header.num_filelists),
-            build_type: Some(self.header.build_type),
-            endian: self.endian,
-            files: self
+            num_filelists: Some(val.header.num_filelists),
+            build_type: Some(val.header.build_type),
+            endian: val.endian,
+            files: val
                 .filenames
                 .into_iter()
-                .zip(self.header.fileinfo)
+                .zip(val.header.fileinfo)
                 .map(|(filename, info)| {
                     (
                         filename,

eurochef-filelist/src/v9.rs

@@ -55,7 +55,7 @@ impl EXFileList9 {
             let size = end - start;
             let mut data = vec![0u8; size as usize];
             reader.seek(std::io::SeekFrom::Start(*start))?;
-            reader.read(&mut data)?;
+            reader.read_exact(&mut data)?;
 
             if res.header.version >= 10 {
                 unscramble_filename_v10(i as u32, &mut data);
@@ -73,16 +73,16 @@ impl EXFileList9 {
 }
 
 // TODO: Make a trait for filelists bundling both the read and from/into functions so that they can be used genericly
-impl Into<UXFileList> for EXFileList9 {
-    fn into(self) -> UXFileList {
+impl From<EXFileList9> for UXFileList {
+    fn from(val: EXFileList9) -> Self {
         UXFileList {
-            num_filelists: Some(self.header.num_filelists),
-            build_type: Some(self.header.build_type),
-            endian: self.endian,
-            files: self
+            num_filelists: Some(val.header.num_filelists),
+            build_type: Some(val.header.build_type),
+            endian: val.endian,
+            files: val
                 .filenames
                 .into_iter()
-                .zip(self.header.fileinfo)
+                .zip(val.header.fileinfo)
                 .map(|(filename, info)| {
                     (
                         filename,

eurochef/cli/src/edb/animations.rs

@@ -28,11 +28,7 @@ pub fn execute_command(
 
     let output_folder = output_folder.unwrap_or(format!(
         "./entities/{}/",
-        Path::new(&filename)
-            .file_name()
-            .unwrap()
-            .to_string_lossy()
-            .to_string(),
+        Path::new(&filename).file_name().unwrap().to_string_lossy()
     ));
     let output_folder = Path::new(&output_folder);
 
@@ -66,7 +62,7 @@ pub fn execute_command(
         )
         .unwrap()
         .progress_chars("##-")
-        .tick_chars(&TICK_STRINGS),
+        .tick_chars(TICK_STRINGS),
     );
     pb.set_message("Extracting textures");
 
@@ -77,7 +73,7 @@ pub fn execute_command(
         let _span_enter = _span.enter();
 
         if let Ok(t) = it.data {
-            if t.frames.len() == 0 {
+            if t.frames.is_empty() {
                 error!("Skipping texture with no frames");
                 continue;
             }
@@ -118,7 +114,7 @@ pub fn execute_command(
         )
         .unwrap()
         .progress_chars("##-")
-        .tick_chars(&TICK_STRINGS),
+        .tick_chars(TICK_STRINGS),
     );
     pb.set_message("Extracting animskins");
 
@@ -190,7 +186,7 @@ pub fn execute_command(
                 }
             }
 
-            if vertex_data.len() == 0 {
+            if vertex_data.is_empty() {
                 warn!(
                     "Processed entity doesnt have vertex data! (v={}/i={}/t={})",
                     vertex_data.len(),
@@ -199,7 +195,7 @@ pub fn execute_command(
                 );
             }
 
-            if strips.len() <= 0 {
+            if strips.is_empty() {
                 continue;
             }
 

eurochef/cli/src/edb/entities.rs

@@ -34,11 +34,7 @@ pub fn execute_command(
 ) -> anyhow::Result<()> {
     let output_folder = output_folder.unwrap_or(format!(
         "./entities/{}/",
-        Path::new(&filename)
-            .file_name()
-            .unwrap()
-            .to_string_lossy()
-            .to_string(),
+        Path::new(&filename).file_name().unwrap().to_string_lossy()
     ));
     let output_folder = Path::new(&output_folder);
 
@@ -92,7 +88,7 @@ pub fn execute_command(
             )
             .unwrap()
             .progress_chars("##-")
-            .tick_chars(&TICK_STRINGS),
+            .tick_chars(TICK_STRINGS),
         );
         pb.set_message("Extracting textures");
 
@@ -103,7 +99,7 @@ pub fn execute_command(
             let _span_enter = _span.enter();
 
             if let Ok(t) = it.data {
-                if t.frames.len() == 0 {
+                if t.frames.is_empty() {
                     error!("Skipping texture with no frames");
                     continue;
                 }
@@ -164,7 +160,7 @@ pub fn execute_command(
         )
         .unwrap()
         .progress_chars("##-")
-        .tick_chars(&TICK_STRINGS),
+        .tick_chars(TICK_STRINGS),
     );
     pb.set_message("Extracting entities");
 
@@ -210,7 +206,7 @@ pub fn execute_command(
             continue;
         }
 
-        if strips.len() <= 0 {
+        if strips.is_empty() {
             warn!(
                 "Processed entity doesnt have tristrips! (v={}/i={}/t={})",
                 vertex_data.len(),
@@ -234,7 +230,7 @@ pub fn execute_command(
             }
         }
 
-        if vertex_data.len() == 0 {
+        if vertex_data.is_empty() {
             warn!(
                 "Processed entity doesnt have vertex data! (v={}/i={}/t={})",
                 vertex_data.len(),
@@ -243,7 +239,7 @@ pub fn execute_command(
             );
         }
 
-        let mut gltf = gltf_export::create_mesh_scene(&ent_id);
+        let mut gltf = gltf_export::create_mesh_scene(ent_id);
         gltf_export::add_mesh_to_scene(
             &mut gltf,
             &vertex_data,