Fix clippy errors

This fixes warnings/errors in the code base according to cargo
1.66.0's clippy.

Signed-off-by: Liu Bo <[email protected]>

Author: liubogithub

src/abi/fuse_abi.rs

@@ -600,13 +600,16 @@ impl Attr {
             atimensec: st.st_atime_nsec as u32,
             mtimensec: st.st_mtime_nsec as u32,
             ctimensec: st.st_ctime_nsec as u32,
+            #[cfg(target_os = "linux")]
+            mode: st.st_mode,
+            #[cfg(target_os = "macos")]
             mode: st.st_mode as u32,
             nlink: st.st_nlink as u32,
             uid: st.st_uid,
             gid: st.st_gid,
             rdev: st.st_rdev as u32,
             blksize: st.st_blksize as u32,
-            flags: flags as u32,
+            flags,
             #[cfg(target_os = "macos")]
             crtime: 0,
             #[cfg(target_os = "macos")]
@@ -658,6 +661,22 @@ pub struct Kstatfs {
 unsafe impl ByteValued for Kstatfs {}
 
 impl From<statvfs64> for Kstatfs {
+    #[cfg(target_os = "linux")]
+    fn from(st: statvfs64) -> Self {
+        Kstatfs {
+            blocks: st.f_blocks,
+            bfree: st.f_bfree,
+            bavail: st.f_bavail,
+            files: st.f_files,
+            ffree: st.f_ffree,
+            bsize: st.f_bsize as u32,
+            namelen: st.f_namemax as u32,
+            frsize: st.f_frsize as u32,
+            ..Default::default()
+        }
+    }
+
+    #[cfg(target_os = "macos")]
     fn from(st: statvfs64) -> Self {
         Kstatfs {
             blocks: st.f_blocks as u64,
@@ -745,7 +764,7 @@ impl From<u32> for Opcode {
         if op >= Opcode::MaxOpcode as u32 {
             return Opcode::MaxOpcode;
         }
-        unsafe { mem::transmute(op as u32) }
+        unsafe { mem::transmute(op) }
     }
 }
 

src/api/pseudo_fs.rs

@@ -258,7 +258,14 @@ impl PseudoFs {
             ..Default::default()
         };
         attr.ino = ino;
-        attr.mode = (libc::S_IFDIR | libc::S_IRWXU | libc::S_IRWXG | libc::S_IRWXO) as u32;
+        #[cfg(target_os = "linux")]
+        {
+            attr.mode = libc::S_IFDIR | libc::S_IRWXU | libc::S_IRWXG | libc::S_IRWXO;
+        }
+        #[cfg(target_os = "macos")]
+        {
+            attr.mode = (libc::S_IFDIR | libc::S_IRWXU | libc::S_IRWXG | libc::S_IRWXO) as u32;
+        }
         let now = SystemTime::now();
         attr.ctime = now
             .duration_since(SystemTime::UNIX_EPOCH)

src/api/server/sync_io.rs

@@ -284,10 +284,10 @@ impl<F: FileSystem + Sync> Server<F> {
 
         #[cfg(target_os = "linux")]
         let flags =
-            flags & (libc::RENAME_EXCHANGE | libc::RENAME_NOREPLACE | libc::RENAME_WHITEOUT) as u32;
+            flags & (libc::RENAME_EXCHANGE | libc::RENAME_NOREPLACE | libc::RENAME_WHITEOUT);
 
         #[cfg(target_os = "macos")]
-        let flags = flags & (libc::RENAME_EXCL | libc::RENAME_SWAP) as u32;
+        let flags = flags & (libc::RENAME_EXCL | libc::RENAME_SWAP);
 
         self.do_rename(ctx, size_of::<Rename2In>(), newdir, flags)
     }

src/api/vfs/mod.rs

@@ -286,7 +286,7 @@ impl Vfs {
     /// Create a new vfs instance
     pub fn new(opts: VfsOptions) -> Self {
         Vfs {
-            next_super: AtomicU8::new((VFS_PSEUDO_FS_IDX + 1) as u8),
+            next_super: AtomicU8::new(VFS_PSEUDO_FS_IDX + 1),
             mountpoints: ArcSwap::new(Arc::new(HashMap::new())),
             superblocks: ArcSwap::new(Arc::new(vec![None; MAX_VFS_INDEX])),
             root: PseudoFs::new(),

src/common/file_buf.rs

@@ -168,12 +168,10 @@ impl<'a> FileVolatileSlice<'a> {
 
     /// Return a subslice of this [FileVolatileSlice] starting at `offset`.
     pub fn offset(&self, count: usize) -> Result<Self, Error> {
-        let new_addr = (self.addr as usize)
-            .checked_add(count)
-            .ok_or(Error::Overflow {
-                base: self.addr as usize,
-                offset: count,
-            })?;
+        let new_addr = self.addr.checked_add(count).ok_or(Error::Overflow {
+            base: self.addr,
+            offset: count,
+        })?;
         let new_size = self
             .size
             .checked_sub(count)

src/passthrough/sync_io.rs

@@ -257,7 +257,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
         if !no_open {
             self.handle_map.get(handle, inode)
         } else {
-            let file = self.open_inode(inode, (flags | libc::O_DIRECTORY) as i32)?;
+            let file = self.open_inode(inode, flags | libc::O_DIRECTORY)?;
             Ok(Arc::new(HandleData::new(inode, file)))
         }
     }
@@ -272,7 +272,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
         if !no_open {
             self.handle_map.get(handle, inode)
         } else {
-            let file = self.open_inode(inode, flags as i32)?;
+            let file = self.open_inode(inode, flags)?;
             Ok(Arc::new(HandleData::new(inode, file)))
         }
     }
@@ -617,7 +617,7 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
             libc::O_RDONLY
         };
 
-        let file = self.open_inode(inode, open_flags as i32)?;
+        let file = self.open_inode(inode, open_flags)?;
         (*vu_req).map(foffset, moffset, len, flags, file.as_raw_fd())
     }
 

src/transport/mod.rs

@@ -127,7 +127,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
         // `Reader::new()` and `Writer::new()`).
         self.buffers
             .iter()
-            .fold(0usize, |count, buf| count + buf.len() as usize)
+            .fold(0usize, |count, buf| count + buf.len())
     }
 
     fn bytes_consumed(&self) -> usize {
@@ -154,7 +154,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
             bufs.push(local_buf);
 
             // Don't need check_sub() as we just made sure rem >= local_buf.len()
-            rem -= local_buf.len() as usize;
+            rem -= local_buf.len();
         }
 
         bufs
@@ -242,7 +242,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
             local_buf.bitmap().mark_dirty(0, local_buf.len());
 
             // Don't need check_sub() as we just made sure rem >= local_buf.len()
-            rem -= local_buf.len() as usize;
+            rem -= local_buf.len();
         }
     }