Skip to content

Commit 6788a74

Browse files
mofishzzbergwolf
mofishzz
authored and
bergwolf
committed
Fix clippy warning from rust 1.67.0
Fix warning for clippy::uninlined-format-args. Signed-off-by: Huang Jianan <jnhuang@linux.alibaba.com>
1 parent 1f5d837 commit 6788a74

File tree

7 files changed

+37
-43
lines changed

7 files changed

+37
-43
lines changed

‎src/api/vfs/mod.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ impl Vfs {
350350
if ino > VFS_MAX_INO {
351351
fs.destroy();
352352
return Err(VfsError::InodeIndex(format!(
353-
"Unsupported max inode number, requested {} supported {}",
354-
ino, VFS_MAX_INO
353+
"Unsupported max inode number, requested {ino} supported {VFS_MAX_INO}"
355354
)));
356355
}
357356

@@ -360,7 +359,7 @@ impl Vfs {
360359
if self.initialized() {
361360
let opts = self.opts.load().deref().out_opts;
362361
fs.init(opts).map_err(|e| {
363-
VfsError::Initialize(format!("Can't initialize with opts {:?}, {:?}", opts, e))
362+
VfsError::Initialize(format!("Can't initialize with opts {opts:?}, {e:?}"))
364363
})?;
365364
}
366365
let index = self.allocate_fs_idx().map_err(VfsError::FsIndex)?;
@@ -442,10 +441,7 @@ impl Vfs {
442441
if inode > VFS_MAX_INO {
443442
return Err(Error::new(
444443
ErrorKind::Other,
445-
format!(
446-
"Inode number {} too large, max supported {}",
447-
inode, VFS_MAX_INO
448-
),
444+
format!("Inode number {inode} too large, max supported {VFS_MAX_INO}"),
449445
));
450446
}
451447
let ino: u64 = ((fs_idx as u64) << VFS_INDEX_SHIFT) | inode;

‎src/common/file_buf.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@ pub enum Error {
4141
impl fmt::Display for Error {
4242
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
4343
match self {
44-
Error::OutOfBounds { addr } => write!(f, "address 0x{:x} is out of bounds", addr),
44+
Error::OutOfBounds { addr } => write!(f, "address 0x{addr:x} is out of bounds"),
4545
Error::Overflow { base, offset } => write!(
4646
f,
47-
"address 0x{:x} offset by 0x{:x} would overflow",
48-
base, offset
47+
"address 0x{base:x} offset by 0x{offset:x} would overflow"
4948
),
50-
Error::VolatileSlice(e) => write!(f, "{}", e),
49+
Error::VolatileSlice(e) => write!(f, "{e}"),
5150
}
5251
}
5352
}

‎src/lib.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,15 @@ impl fmt::Display for Error {
8282
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
8383
use Error::*;
8484
match self {
85-
DecodeMessage(err) => write!(f, "failed to decode fuse message: {}", err),
86-
EncodeMessage(err) => write!(f, "failed to encode fuse message: {}", err),
85+
DecodeMessage(err) => write!(f, "failed to decode fuse message: {err}"),
86+
EncodeMessage(err) => write!(f, "failed to encode fuse message: {err}"),
8787
MissingParameter => write!(f, "one or more parameters are missing"),
8888
InvalidHeaderLength => write!(f, "the `len` field of the header is too small"),
89-
InvalidCString(err) => write!(f, "a c string parameter is invalid: {}", err),
89+
InvalidCString(err) => write!(f, "a c string parameter is invalid: {err}"),
9090
InvalidXattrSize((size, len)) => write!(
9191
f,
9292
"The `size` field of the `SetxattrIn` message does not match the length of the \
93-
decoded value: size = {}, value.len() = {}",
94-
size, len
93+
decoded value: size = {size}, value.len() = {len}"
9594
),
9695
}
9796
}

‎src/passthrough/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
600600
&root,
601601
&self.mount_fds,
602602
|fd, flags, _mode| {
603-
let pathname = CString::new(format!("{}", fd))
603+
let pathname = CString::new(format!("{fd}"))
604604
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
605605
Self::open_file(self.proc_self_fd.as_raw_fd(), &pathname, flags, 0)
606606
},
@@ -763,7 +763,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
763763
return Err(ebadf());
764764
}
765765

766-
let pathname = CString::new(format!("{}", fd))
766+
let pathname = CString::new(format!("{fd}"))
767767
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
768768

769769
// We don't really check `flags` because if the kernel can't handle poorly specified flags
@@ -926,7 +926,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
926926
error!("fuse: max inode number reached: {}", VFS_MAX_INO);
927927
return Err(io::Error::new(
928928
io::ErrorKind::Other,
929-
format!("max inode number reached: {}", VFS_MAX_INO),
929+
format!("max inode number reached: {VFS_MAX_INO}"),
930930
));
931931
}
932932
trace!(

‎src/transport/fusedev/linux_session.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ impl FuseSession {
5757
) -> Result<FuseSession> {
5858
let dest = mountpoint
5959
.canonicalize()
60-
.map_err(|_| SessionFailure(format!("invalid mountpoint {:?}", mountpoint)))?;
60+
.map_err(|_| SessionFailure(format!("invalid mountpoint {mountpoint:?}")))?;
6161
if !dest.is_dir() {
62-
return Err(SessionFailure(format!("{:?} is not a directory", dest)));
62+
return Err(SessionFailure(format!("{dest:?} is not a directory")));
6363
}
6464

6565
Ok(FuseSession {
@@ -82,7 +82,7 @@ impl FuseSession {
8282
let file = fuse_kern_mount(&self.mountpoint, &self.fsname, &self.subtype, flags)?;
8383

8484
fcntl(file.as_raw_fd(), FcntlArg::F_SETFL(OFlag::O_NONBLOCK))
85-
.map_err(|e| SessionFailure(format!("set fd nonblocking: {}", e)))?;
85+
.map_err(|e| SessionFailure(format!("set fd nonblocking: {e}")))?;
8686
self.file = Some(file);
8787

8888
Ok(())
@@ -136,7 +136,7 @@ impl FuseSession {
136136
if let Some(file) = &self.file {
137137
let file = file
138138
.try_clone()
139-
.map_err(|e| SessionFailure(format!("dup fd: {}", e)))?;
139+
.map_err(|e| SessionFailure(format!("dup fd: {e}")))?;
140140
let channel = FuseChannel::new(file, self.bufsize)?;
141141
let waker = channel.get_waker();
142142
self.add_waker(waker)?;
@@ -151,7 +151,7 @@ impl FuseSession {
151151
let mut wakers = self
152152
.wakers
153153
.lock()
154-
.map_err(|e| SessionFailure(format!("lock wakers: {}", e)))?;
154+
.map_err(|e| SessionFailure(format!("lock wakers: {e}")))?;
155155
wakers.push(waker);
156156
Ok(())
157157
}
@@ -161,11 +161,11 @@ impl FuseSession {
161161
let wakers = self
162162
.wakers
163163
.lock()
164-
.map_err(|e| SessionFailure(format!("lock wakers: {}", e)))?;
164+
.map_err(|e| SessionFailure(format!("lock wakers: {e}")))?;
165165
for waker in wakers.iter() {
166166
waker
167167
.wake()
168-
.map_err(|e| SessionFailure(format!("wake channel: {}", e)))?;
168+
.map_err(|e| SessionFailure(format!("wake channel: {e}")))?;
169169
}
170170
Ok(())
171171
}
@@ -189,9 +189,9 @@ pub struct FuseChannel {
189189

190190
impl FuseChannel {
191191
fn new(file: File, bufsize: usize) -> Result<Self> {
192-
let poll = Poll::new().map_err(|e| SessionFailure(format!("epoll create: {}", e)))?;
192+
let poll = Poll::new().map_err(|e| SessionFailure(format!("epoll create: {e}")))?;
193193
let waker = Waker::new(poll.registry(), EXIT_FUSE_EVENT)
194-
.map_err(|e| SessionFailure(format!("epoll register session fd: {}", e)))?;
194+
.map_err(|e| SessionFailure(format!("epoll register session fd: {e}")))?;
195195
let waker = Arc::new(waker);
196196

197197
// mio default add EPOLLET to event flags, so epoll will use edge-triggered mode.
@@ -205,7 +205,7 @@ impl FuseChannel {
205205
file.as_raw_fd(),
206206
Some(&mut event),
207207
)
208-
.map_err(|e| SessionFailure(format!("epoll register channel fd: {}", e)))?;
208+
.map_err(|e| SessionFailure(format!("epoll register channel fd: {e}")))?;
209209

210210
Ok(FuseChannel {
211211
file,
@@ -233,7 +233,7 @@ impl FuseChannel {
233233
match self.poll.poll(&mut events, None) {
234234
Ok(_) => {}
235235
Err(ref e) if e.kind() == std::io::ErrorKind::Interrupted => continue,
236-
Err(e) => return Err(SessionFailure(format!("epoll wait: {}", e))),
236+
Err(e) => return Err(SessionFailure(format!("epoll wait: {e}"))),
237237
}
238238

239239
for event in events.iter() {
@@ -300,7 +300,7 @@ impl FuseChannel {
300300
}
301301
e => {
302302
warn! {"read fuse dev failed on fd {}: {}", fd, e};
303-
return Err(SessionFailure(format!("read new request: {:?}", e)));
303+
return Err(SessionFailure(format!("read new request: {e:?}")));
304304
}
305305
},
306306
}
@@ -316,10 +316,10 @@ fn fuse_kern_mount(mountpoint: &Path, fsname: &str, subtype: &str, flags: MsFlag
316316
.read(true)
317317
.write(true)
318318
.open(FUSE_DEVICE)
319-
.map_err(|e| SessionFailure(format!("open {}: {}", FUSE_DEVICE, e)))?;
319+
.map_err(|e| SessionFailure(format!("open {FUSE_DEVICE}: {e}")))?;
320320
let meta = mountpoint
321321
.metadata()
322-
.map_err(|e| SessionFailure(format!("stat {:?}: {}", mountpoint, e)))?;
322+
.map_err(|e| SessionFailure(format!("stat {mountpoint:?}: {e}")))?;
323323
let opts = format!(
324324
"default_permissions,allow_other,fd={},rootmode={:o},user_id={},group_id={}",
325325
file.as_raw_fd(),
@@ -350,7 +350,7 @@ fn fuse_kern_mount(mountpoint: &Path, fsname: &str, subtype: &str, flags: MsFlag
350350
flags,
351351
Some(opts.deref()),
352352
)
353-
.map_err(|e| SessionFailure(format!("failed to mount {:?}: {}", mountpoint, e)))?;
353+
.map_err(|e| SessionFailure(format!("failed to mount {mountpoint:?}: {e}")))?;
354354

355355
Ok(file)
356356
}
@@ -373,7 +373,7 @@ fn fuse_kern_umount(mountpoint: &str, file: File) -> Result<()> {
373373
// cause deadlock.
374374
drop(file);
375375
umount2(mountpoint, MntFlags::MNT_DETACH)
376-
.map_err(|e| SessionFailure(format!("failed to umount {}: {}", mountpoint, e)))
376+
.map_err(|e| SessionFailure(format!("failed to umount {mountpoint}: {e}")))
377377
}
378378

379379
#[cfg(test)]

‎src/transport/fusedev/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ impl<'a, S: BitmapSlice> FuseDevWriter<'a, S> {
276276
fn do_write(fd: RawFd, data: &[u8]) -> io::Result<usize> {
277277
write(fd, data).map_err(|e| {
278278
error! {"fail to write to fuse device fd {}: {}, {:?}", fd, e, data};
279-
io::Error::new(io::ErrorKind::Other, format!("{}", e))
279+
io::Error::new(io::ErrorKind::Other, format!("{e}"))
280280
})
281281
}
282282
}
@@ -317,7 +317,7 @@ impl<'a, S: BitmapSlice> io::Write for FuseDevWriter<'a, S> {
317317
})
318318
.map_err(|e| {
319319
error! {"fail to write to fuse device on commit: {}", e};
320-
io::Error::new(io::ErrorKind::Other, format!("{}", e))
320+
io::Error::new(io::ErrorKind::Other, format!("{e}"))
321321
})
322322
}
323323
}

‎src/transport/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@ impl fmt::Display for Error {
8585
FindMemoryRegion => write!(f, "no memory region for this address range"),
8686
InvalidChain => write!(f, "invalid descriptor chain"),
8787
InvalidParameter => write!(f, "invalid parameter"),
88-
IoError(e) => write!(f, "descriptor I/O error: {}", e),
89-
SplitOutOfBounds(off) => write!(f, "`DescriptorChain` split is out of bounds: {}", off),
90-
VolatileMemoryError(e) => write!(f, "volatile memory error: {}", e),
88+
IoError(e) => write!(f, "descriptor I/O error: {e}"),
89+
SplitOutOfBounds(off) => write!(f, "`DescriptorChain` split is out of bounds: {off}"),
90+
VolatileMemoryError(e) => write!(f, "volatile memory error: {e}"),
9191

9292
#[cfg(feature = "fusedev")]
93-
SessionFailure(e) => write!(f, "fuse session failure: {}", e),
93+
SessionFailure(e) => write!(f, "fuse session failure: {e}"),
9494

9595
#[cfg(feature = "virtiofs")]
96-
ConvertIndirectDescriptor(e) => write!(f, "invalid indirect descriptor: {}", e),
96+
ConvertIndirectDescriptor(e) => write!(f, "invalid indirect descriptor: {e}"),
9797
#[cfg(feature = "virtiofs")]
98-
GuestMemoryError(e) => write!(f, "descriptor guest memory error: {}", e),
98+
GuestMemoryError(e) => write!(f, "descriptor guest memory error: {e}"),
9999
}
100100
}
101101
}

0 commit comments

Comments
 (0)