Fix warnings

Author: wwylele

libsave3ds/src/cart_save_data.rs

@@ -155,8 +155,8 @@ mod test {
 
             crate::file_system::test::fuzzer(
                 file_system,
-                param.max_dir as usize,
-                param.max_file as usize,
+                param.max_dir,
+                param.max_file,
                 || CartSaveData::new(raw.clone(), &cart_format).unwrap(),
                 gen_name,
                 gen_len,

libsave3ds/src/ext_data.rs

@@ -504,7 +504,7 @@ impl File {
                     if quota.free_block < block {
                         return make_error(Error::NoSpace);
                     }
-                    quota.mount_id = file_index as u32;
+                    quota.mount_id = file_index;
                     quota.mount_len = physical_len as u64;
                     quota.potential_free_block = quota.free_block;
                     quota.free_block -= block;
@@ -572,7 +572,7 @@ impl File {
 
         if let Some(quota_file) = self.center.quota_file.as_ref() {
             let mut quota: Quota = read_struct(quota_file.partition().as_ref(), 0)?;
-            quota.mount_id = file_index as u32;
+            quota.mount_id = file_index;
             quota.mount_len = physical_len as u64;
             let block = (divide_up(physical_len, 0x1000)) as u32;
             quota.free_block += block;
@@ -854,8 +854,8 @@ mod test {
             let file_system = ExtData::new(nand.clone(), &[], 0, [0; 16], false, true).unwrap();
             crate::file_system::test::fuzzer(
                 file_system,
-                param.max_dir as usize,
-                param.max_file as usize,
+                param.max_dir,
+                param.max_file,
                 || ExtData::new(nand.clone(), &[], 0, [0; 16], false, true).unwrap(),
                 gen_name,
                 gen_len,

libsave3ds/src/file_system.rs

@@ -410,7 +410,7 @@ pub mod test {
                                 Err(Error::NoSpace) => {
                                     let stat = file_system.stat().unwrap();
                                     assert!(
-                                        file_mirrors.len() == max_file as usize
+                                        file_mirrors.len() == max_file
                                             || stat.free_blocks * stat.block_len < len
                                     );
                                 }

libsave3ds/src/lib.rs

@@ -1,3 +1,6 @@
+// digit grouping in this lib has some special meaning
+#![allow(clippy::unusual_byte_groupings)]
+
 mod aes_ctr_file;
 mod byte_struct_common;
 pub mod cart_save_data;

libsave3ds/src/misc.rs

@@ -2,7 +2,7 @@ use sha2::*;
 
 pub fn hash_movable(key: [u8; 16]) -> String {
     let mut hasher = Sha256::new();
-    hasher.update(&key);
+    hasher.update(key);
     let hash = hasher.finalize();
     let mut result = String::new();
     for index in &[3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12] {

libsave3ds/src/save_data.rs

@@ -834,8 +834,8 @@ mod test {
 
             crate::file_system::test::fuzzer(
                 file_system,
-                param.max_dir as usize,
-                param.max_file as usize,
+                param.max_dir,
+                param.max_file,
                 || SaveData::new(disa_raw.clone(), SaveDataType::Bare).unwrap(),
                 gen_name,
                 gen_len,

libsave3ds/src/sd.rs

@@ -45,11 +45,9 @@ impl SdNandFileSystem for Sd {
 
         let hash_path: Vec<u8> = path
             .iter()
-            .map(|s| std::iter::once(b'/').chain(s.bytes()))
-            .flatten()
+            .flat_map(|s| std::iter::once(b'/').chain(s.bytes()))
             .chain(std::iter::once(0))
-            .map(|c| std::iter::once(c).chain(std::iter::once(0)))
-            .flatten()
+            .flat_map(|c| std::iter::once(c).chain(std::iter::once(0)))
             .collect();
 
         let mut hasher = Sha256::new();

save3ds_fuse/src/main.rs

@@ -8,7 +8,6 @@ use libsave3ds::Resource;
 use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::io::Read;
-use std::time::{Duration, SystemTime};
 
 #[cfg(all(unix, feature = "unixfuse"))]
 use {
@@ -17,6 +16,7 @@ use {
         getegid, geteuid, EBADF, EEXIST, EIO, EISDIR, ENAMETOOLONG, ENOENT, ENOSPC, ENOSYS,
         ENOTDIR, ENOTEMPTY, EROFS,
     },
+    std::time::{Duration, SystemTime},
 };
 
 enum FileSystemOperation {
@@ -27,7 +27,7 @@ enum FileSystemOperation {
 }
 
 fn is_legal_char(c: u8) -> bool {
-    c >= 32 && c < 127 && c != 47 && c != 92
+    (32..127).contains(&c) && c != 47 && c != 92
 }
 
 trait NameConvert {
@@ -176,11 +176,15 @@ where
     Ok(())
 }
 
-fn import_impl<T: FileSystem>(save: &T, dir: &T::DirType, path: &std::path::Path) -> Result<(), Error>
+fn import_impl<T: FileSystem>(
+    _save: &T,
+    dir: &T::DirType,
+    path: &std::path::Path,
+) -> Result<(), Error>
 where
     T::NameType: NameConvert + Clone,
 {
-    for entry in std::fs::read_dir(&path)? {
+    for entry in std::fs::read_dir(path)? {
         let entry = entry?;
         println!("{:?}", entry.path());
         let name = if let Some(name) = entry
@@ -198,7 +202,7 @@ where
         let file_type = entry.file_type()?;
         if file_type.is_dir() {
             let dir = dir.new_sub_dir(name)?;
-            import_impl(save, &dir, &entry.path())?
+            import_impl(_save, &dir, &entry.path())?
         } else if file_type.is_file() {
             let mut host_file = std::fs::File::open(&entry.path())?;
             let len = host_file.metadata()?.len() as usize;
@@ -230,7 +234,11 @@ where
 }
 
 #[allow(unreachable_code, unused_variables)]
-fn do_mount<T: FileSystem>(save: T, read_only: bool, mountpoint: &std::path::Path) -> Result<(), Error>
+fn do_mount<T: FileSystem>(
+    save: T,
+    read_only: bool,
+    mountpoint: &std::path::Path,
+) -> Result<(), Error>
 where
     T::NameType: NameConvert + Clone,
 {