tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clippy: use matches!

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-19 11:08:10 +01:00
parent 6334bdc1c5
commit a6bd669854
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backup/catalog.rs
View File

@ -137,18 +137,12 @@ impl DirEntry {
/// Check if DirEntry is a directory /// Check if DirEntry is a directory
pub fn is_directory(&self) -> bool { pub fn is_directory(&self) -> bool {
match self.attr { matches!(self.attr, DirEntryAttribute::Directory { .. })
DirEntryAttribute::Directory { .. } => true,
_ => false,
}
} }
/// Check if DirEntry is a symlink /// Check if DirEntry is a symlink
pub fn is_symlink(&self) -> bool { pub fn is_symlink(&self) -> bool {
match self.attr { matches!(self.attr, DirEntryAttribute::Symlink { .. })
DirEntryAttribute::Symlink { .. } => true,
_ => false,
}
} }
} }

2
src/backup/datastore.rs
View File

@ -546,7 +546,7 @@ impl DataStore {
} }
pub fn garbage_collection_running(&self) -> bool { pub fn garbage_collection_running(&self) -> bool {
if let Ok(_) = self.gc_mutex.try_lock() { false } else { true } !matches!(self.gc_mutex.try_lock(), Ok(_))
} }
pub fn garbage_collection(&self, worker: &dyn TaskState, upid: &UPID) -> Result<(), Error> { pub fn garbage_collection(&self, worker: &dyn TaskState, upid: &UPID) -> Result<(), Error> {

7
src/pxar/create.rs
View File

@ -40,8 +40,7 @@ fn detect_fs_type(fd: RawFd) -> Result<i64, Error> {
pub fn is_virtual_file_system(magic: i64) -> bool { pub fn is_virtual_file_system(magic: i64) -> bool {
use proxmox::sys::linux::magic::*; use proxmox::sys::linux::magic::*;
match magic { matches!(magic, BINFMTFS_MAGIC |
BINFMTFS_MAGIC |
CGROUP2_SUPER_MAGIC | CGROUP2_SUPER_MAGIC |
CGROUP_SUPER_MAGIC | CGROUP_SUPER_MAGIC |
CONFIGFS_MAGIC | CONFIGFS_MAGIC |
@ -58,9 +57,7 @@ pub fn is_virtual_file_system(magic: i64) -> bool {
SECURITYFS_MAGIC | SECURITYFS_MAGIC |
SELINUX_MAGIC | SELINUX_MAGIC |
SMACK_MAGIC | SMACK_MAGIC |
SYSFS_MAGIC => true, SYSFS_MAGIC)
_ => false
}
} }
#[derive(Debug)] #[derive(Debug)]

5
src/pxar/metadata.rs
View File

@ -345,10 +345,7 @@ fn apply_quota_project_id(flags: Flags, fd: RawFd, metadata: &Metadata) -> Resul
} }
pub(crate) fn errno_is_unsupported(errno: Errno) -> bool { pub(crate) fn errno_is_unsupported(errno: Errno) -> bool {
match errno { matches!(errno, Errno::ENOTTY | Errno::ENOSYS | Errno::EBADF | Errno::EOPNOTSUPP | Errno::EINVAL)
Errno::ENOTTY | Errno::ENOSYS | Errno::EBADF | Errno::EOPNOTSUPP | Errno::EINVAL => true,
_ => false,
}
} }
fn apply_chattr(fd: RawFd, chattr: libc::c_long, mask: libc::c_long) -> Result<(), Error> { fn apply_chattr(fd: RawFd, chattr: libc::c_long, mask: libc::c_long) -> Result<(), Error> {