workaround: avoid regression on nightly

See rust-lang/rust#66757

Author: ubnt-intrepid

polyfuse-tokio/src/server.rs

@@ -11,7 +11,6 @@ use libc::c_int;
 use polyfuse::{request::BytesBuffer, Filesystem, Session, SessionInitializer};
 use std::{ffi::OsStr, io, path::Path, pin::Pin, sync::Arc};
 use tokio::signal::unix::{signal, SignalKind};
-
 /// FUSE filesystem server.
 #[derive(Debug)]
 pub struct Server {

polyfuse/src/common.rs

@@ -65,21 +65,21 @@ impl TryFrom<libc::stat> for FileAttr {
 
     fn try_from(attr: libc::stat) -> Result<Self, Self::Error> {
         Ok(Self(fuse_attr {
-            ino: u64::try_from(attr.st_ino)?,
-            size: u64::try_from(attr.st_size)?,
-            blocks: u64::try_from(attr.st_blocks)?,
-            atime: u64::try_from(attr.st_atime)?,
-            mtime: u64::try_from(attr.st_mtime)?,
-            ctime: u64::try_from(attr.st_ctime)?,
-            atimensec: u32::try_from(attr.st_atime_nsec)?,
-            mtimensec: u32::try_from(attr.st_mtime_nsec)?,
-            ctimensec: u32::try_from(attr.st_ctime_nsec)?,
-            mode: u32::try_from(attr.st_mode)?,
-            nlink: u32::try_from(attr.st_nlink)?,
-            uid: u32::try_from(attr.st_uid)?,
-            gid: u32::try_from(attr.st_gid)?,
-            rdev: u32::try_from(attr.st_gid)?,
-            blksize: u32::try_from(attr.st_blksize)?,
+            ino: u64::try_from(attr.st_ino).map_err(Self::Error::from)?,
+            size: u64::try_from(attr.st_size).map_err(Self::Error::from)?,
+            blocks: u64::try_from(attr.st_blocks).map_err(Self::Error::from)?,
+            atime: u64::try_from(attr.st_atime).map_err(Self::Error::from)?,
+            mtime: u64::try_from(attr.st_mtime).map_err(Self::Error::from)?,
+            ctime: u64::try_from(attr.st_ctime).map_err(Self::Error::from)?,
+            atimensec: u32::try_from(attr.st_atime_nsec).map_err(Self::Error::from)?,
+            mtimensec: u32::try_from(attr.st_mtime_nsec).map_err(Self::Error::from)?,
+            ctimensec: u32::try_from(attr.st_ctime_nsec).map_err(Self::Error::from)?,
+            mode: u32::try_from(attr.st_mode).map_err(Self::Error::from)?,
+            nlink: u32::try_from(attr.st_nlink).map_err(Self::Error::from)?,
+            uid: u32::try_from(attr.st_uid).map_err(Self::Error::from)?,
+            gid: u32::try_from(attr.st_gid).map_err(Self::Error::from)?,
+            rdev: u32::try_from(attr.st_gid).map_err(Self::Error::from)?,
+            blksize: u32::try_from(attr.st_blksize).map_err(Self::Error::from)?,
             padding: 0,
         }))
     }
@@ -199,14 +199,14 @@ impl TryFrom<libc::statvfs> for StatFs {
 
     fn try_from(st: libc::statvfs) -> Result<Self, Self::Error> {
         Ok(Self(fuse_kstatfs {
-            bsize: u32::try_from(st.f_bsize)?,
-            frsize: u32::try_from(st.f_frsize)?,
-            blocks: u64::try_from(st.f_blocks)?,
-            bfree: u64::try_from(st.f_bfree)?,
-            bavail: u64::try_from(st.f_bavail)?,
-            files: u64::try_from(st.f_files)?,
-            ffree: u64::try_from(st.f_ffree)?,
-            namelen: u32::try_from(st.f_namemax)?,
+            bsize: u32::try_from(st.f_bsize).map_err(Self::Error::from)?,
+            frsize: u32::try_from(st.f_frsize).map_err(Self::Error::from)?,
+            blocks: u64::try_from(st.f_blocks).map_err(Self::Error::from)?,
+            bfree: u64::try_from(st.f_bfree).map_err(Self::Error::from)?,
+            bavail: u64::try_from(st.f_bavail).map_err(Self::Error::from)?,
+            files: u64::try_from(st.f_files).map_err(Self::Error::from)?,
+            ffree: u64::try_from(st.f_ffree).map_err(Self::Error::from)?,
+            namelen: u32::try_from(st.f_namemax).map_err(Self::Error::from)?,
             padding: 0,
             spare: [0u32; 6],
         }))