From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC pxar 2/3] clippy: use matches! instead of match
Date: Tue, 12 Jan 2021 14:58:29 +0100 [thread overview]
Message-ID: <20210112135830.2798301-20-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/lib.rs | 25 +++++--------------------
src/util.rs | 7 ++-----
2 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index 4036fd6..ba707da 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -453,42 +453,27 @@ impl Entry {
impl Entry {
/// Check whether this is a directory.
pub fn is_dir(&self) -> bool {
- match self.kind {
- EntryKind::Directory { .. } => true,
- _ => false,
- }
+ matches!(self.kind, EntryKind::Directory)
}
/// Check whether this is a symbolic link.
pub fn is_symlink(&self) -> bool {
- match self.kind {
- EntryKind::Symlink(_) => true,
- _ => false,
- }
+ matches!(self.kind, EntryKind::Symlink(_))
}
/// Check whether this is a hard link.
pub fn is_hardlink(&self) -> bool {
- match self.kind {
- EntryKind::Hardlink(_) => true,
- _ => false,
- }
+ matches!(self.kind, EntryKind::Hardlink(_))
}
/// Check whether this is a device node.
pub fn is_device(&self) -> bool {
- match self.kind {
- EntryKind::Device(_) => true,
- _ => false,
- }
+ matches!(self.kind, EntryKind::Device(_))
}
/// Check whether this is a regular file.
pub fn is_regular_file(&self) -> bool {
- match self.kind {
- EntryKind::File { .. } => true,
- _ => false,
- }
+ matches!(self.kind, EntryKind::File { .. })
}
/// Get the file size if this is a regular file, or `None`.
diff --git a/src/util.rs b/src/util.rs
index 652008b..5740963 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -55,8 +55,7 @@ mod consts {
}
pub fn is_virtual_file_system(magic: i64) -> bool {
- match magic {
- consts::BINFMTFS_MAGIC
+ matches!(magic, consts::BINFMTFS_MAGIC
| consts::CGROUP2_SUPER_MAGIC
| consts::CGROUP_SUPER_MAGIC
| consts::CONFIGFS_MAGIC
@@ -73,9 +72,7 @@ pub fn is_virtual_file_system(magic: i64) -> bool {
| consts::SECURITYFS_MAGIC
| consts::SELINUX_MAGIC
| consts::SMACK_MAGIC
- | consts::SYSFS_MAGIC => true,
- _ => false,
- }
+ | consts::SYSFS_MAGIC)
}
/// Helper function to extract file names from binary archive.
--
2.20.1
next prev parent reply other threads:[~2021-01-12 13:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 13:58 [pbs-devel] [PATCH-SERIES 0/20] update to tokio 1.0 and friends Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 1/4] Cargo.toml: update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 2/4] update to rustyline 7 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 3/4] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox 4/4] tokio 1.0: drop TimeoutFutureExt Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 01/12] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 02/12] tokio 1.0: delay -> sleep Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 03/12] proxmox XXX: use tokio::time::timeout directly Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 04/12] tokio 1.0: AsyncRead/Seek with ReadBuf Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 05/12] tokio: adapt to 1.0 runtime changes Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 06/12] tokio: adapt to 1.0 process:Child changes Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 07/12] tokio 1.0: use ReceiverStream from tokio-stream Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 08/12] tokio 1.0: update to new tokio-openssl interface Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 09/12] tokio 1.0: update to new Signal interface Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 10/12] hyper: use new hyper::upgrade Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 11/12] examples: unify h2 examples Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-backup 12/12] cleanup: remove unnecessary 'mut' and '.clone()' Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH proxmox-fuse] update to tokio 1.0 Fabian Grünbichler
2021-01-12 13:58 ` [pbs-devel] [PATCH pxar 1/3] " Fabian Grünbichler
2021-01-12 13:58 ` Fabian Grünbichler [this message]
2021-01-12 13:58 ` [pbs-devel] [RFC pxar 3/3] remove futures-io feature Fabian Grünbichler
2021-01-12 14:42 ` Wolfgang Bumiller
2021-01-12 14:52 ` [pbs-devel] [PATCH-SERIES 0/20] update to tokio 1.0 and friends Wolfgang Bumiller
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 1/3] fix u2f example Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox-backup] proxmox XXX: adapt to moved ParameterSchema Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 2/3] move ParameterSchema from router to schema Fabian Grünbichler
2021-01-14 13:39 ` [pbs-devel] [PATCH proxmox 3/3] build: add autopkgtest target Fabian Grünbichler
2021-01-14 13:41 ` [pbs-devel] [PATCH pxar 1/2] fix example Fabian Grünbichler
2021-01-14 13:41 ` [pbs-devel] [PATCH pxar 2/2] build: fix --no-default-features Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210112135830.2798301-20-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox