Build & clippy fixes

Author: encounter

lib/src/format/cmdl.rs

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use std::{io::Cursor, marker::PhantomData};
 
 use anyhow::{bail, ensure, Result};
@@ -300,21 +302,21 @@ pub struct SMeshLoadInformation {
     pub mesh_count: u32,
     #[br(count = mesh_count)]
     pub meshes: Vec<CRenderMesh>,
-    #[br(count = (mesh_count + 3) / 4)]
+    #[br(count = mesh_count.div_ceil(4))]
     pub unk_data_1: Vec<u8>,
-    #[br(count = (mesh_count + 7) / 8)]
+    #[br(count = mesh_count.div_ceil(8))]
     pub unk_data_2: Vec<u8>,
     #[bw(try_calc = shorts.len().try_into())]
     pub short_count: u32,
     #[br(count = short_count)]
     pub shorts: Vec<u16>,
     // #[bw(try_calc = lod_info.len().try_into())]
     pub lod_count: u8,
-    #[br(count = lod_count)]
+    #[br(count = lod_count as usize)]
     pub lod_info: Vec<SLodInfoOuter>,
     #[bw(calc = if lod_rules.is_empty() { 0 } else { 1 })]
     pub has_lod_rules: u32,
-    #[br(if(has_lod_rules == 1), count(lod_count))]
+    #[br(if(has_lod_rules == 1), count(lod_count as usize))]
     pub lod_rules: Vec<SRenderModelLODRule>,
 }
 

lib/src/format/mcon.rs

@@ -20,6 +20,7 @@ const K_CHUNK_MCCD: FourCC = FourCC(*b"MCCD");
 
 #[binrw]
 #[derive(Clone, Debug)]
+#[allow(unused)]
 struct SModConHeader {
     unk: u32,
 }

lib/src/format/pack.rs

@@ -444,7 +444,10 @@ where O: ByteOrderExt + 'static
                 ensure!(asset_entry.asset_type == form.id);
                 ensure!(asset_entry.version.get() == form.reader_version.get());
                 ensure!(asset_entry.other_version.get() == form.writer_version.get());
-                ensure!(form.size.get() == 0 || asset_entry.decompressed_size.get() == form.size.get() + 32 /* RFRM */);
+                ensure!(
+                    form.size.get() == 0
+                        || asset_entry.decompressed_size.get() == form.size.get() + 32 /* RFRM */
+                );
             }
 
             let asset_id = asset_entry.asset_id.get();

lib/src/format/room.rs

@@ -605,7 +605,7 @@ fn parse_property_list<R: Read + Seek>(
             ),
             None => (None, None),
         };
-        let value = value.unwrap_or_else(|| ConstructedPropertyValue::Unknown(data));
+        let value = value.unwrap_or(ConstructedPropertyValue::Unknown(data));
         properties.push(ConstructedProperty { id, name, value });
     }
     Ok(ConstructedPropertyValue::PropertyList(Box::new(ConstructedPropertyList {

lib/src/format/txtr.rs

@@ -764,8 +764,8 @@ pub fn decompress_image(
         | ETextureFormat::RgbaAstc12x10Srgb
         | ETextureFormat::RgbaAstc12x12Srgb => {
             let (bw, bh, _) = format.block_size();
-            let rw = (w + (bw as u32 - 1)) / bw as u32;
-            let rh = (h + (bh as u32 - 1)) / bh as u32;
+            let rw = w.div_ceil(bw as u32);
+            let rh = h.div_ceil(bh as u32);
             ensure!(data.len() == rw as usize * rh as usize * 16);
             let mut image = RgbaImage::new(w, h);
             astc_decode::astc_decode(

lib/src/lib.rs

@@ -1,2 +1,3 @@
+#![allow(clippy::double_parens)]
 pub mod format;
 pub mod util;

lib/src/util/lzss.rs

@@ -94,7 +94,7 @@ impl<'a> DecompressionState<'a> {
 
     #[inline]
     fn read_byte(&mut self) -> Option<u8> {
-        if self.input.len() > 0 {
+        if !self.input.is_empty() {
             let b = self.input[0];
             self.input = &self.input[1..];
             Some(b)

retrotool-gui/src/loaders/lightprobe.rs

@@ -18,8 +18,10 @@ use crate::{
 #[derive(Debug, Clone, bevy::reflect::TypeUuid)]
 #[uuid = "f5d65a8b-ffcc-47ea-8c9d-1ab30cca723c"]
 pub struct LightProbeAsset {
+    #[allow(unused)]
     pub head: LightProbeBundleHeader,
     pub textures: Vec<TextureAsset>,
+    #[allow(unused)]
     pub extra: Vec<LightProbeExtra>,
 }
 

retrotool-gui/src/loaders/material.rs

@@ -9,6 +9,7 @@ use zerocopy::LittleEndian;
 #[derive(Debug, Clone, bevy::reflect::TypeUuid)]
 #[uuid = "83269869-1209-408e-8835-bc6f2496e82a"]
 pub struct MaterialAsset {
+    #[allow(unused)]
     pub inner: ModelData<LittleEndian>,
 }
 

retrotool-gui/src/loaders/package.rs

@@ -58,16 +58,13 @@ impl AssetIo for RetroAssetIo {
                 let Some(package_path) = package_path else {
                     return Err(AssetIoError::NotFound(path.to_owned()));
                 };
-                read_asset(&package_path, id).map_err(|e| {
-                    AssetIoError::Io(std::io::Error::new(std::io::ErrorKind::Other, e))
-                })
+                read_asset(&package_path, id)
+                    .map_err(|e| AssetIoError::Io(std::io::Error::other(e)))
             })
         } else if path.extension() == Some("pak".as_ref()) {
             // Load pak header only
             Box::pin(async move {
-                read_pak_header(path).map_err(|e| {
-                    AssetIoError::Io(std::io::Error::new(std::io::ErrorKind::Other, e))
-                })
+                read_pak_header(path).map_err(|e| AssetIoError::Io(std::io::Error::other(e)))
             })
         } else {
             self.default.load_path(path)