From c28ab1fcac93804918cf5d0ca154652ec443b7f8 Mon Sep 17 00:00:00 2001
From: Ayush Mishra <ayushmishra2005@gmail.com>
Date: Sun, 16 May 2021 01:13:58 +0530
Subject: [PATCH] Improve match statement (#8817)
---
substrate/client/db/src/lib.rs | 5 +----
substrate/primitives/core/src/crypto.rs | 15 +++------------
.../runtime_interface/bare_function_interface.rs | 5 +----
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/substrate/client/db/src/lib.rs b/substrate/client/db/src/lib.rs
index 94535cf28ae..c684245be35 100644
--- a/substrate/client/db/src/lib.rs
+++ b/substrate/client/db/src/lib.rs
@@ -335,10 +335,7 @@ impl DatabaseSettingsSrc {
}
/// Check if database supports internal ref counting for state data.
pub fn supports_ref_counting(&self) -> bool {
- match self {
- DatabaseSettingsSrc::ParityDb { .. } => true,
- _ => false,
- }
+ matches!(self, DatabaseSettingsSrc::ParityDb { .. })
}
}
diff --git a/substrate/primitives/core/src/crypto.rs b/substrate/primitives/core/src/crypto.rs
index 7446ab25ce4..80209a25c41 100644
--- a/substrate/primitives/core/src/crypto.rs
+++ b/substrate/primitives/core/src/crypto.rs
@@ -161,18 +161,12 @@ impl DeriveJunction {
/// Return `true` if the junction is soft.
pub fn is_soft(&self) -> bool {
- match *self {
- DeriveJunction::Soft(_) => true,
- _ => false,
- }
+ matches!(*self, DeriveJunction::Soft(_))
}
/// Return `true` if the junction is hard.
pub fn is_hard(&self) -> bool {
- match *self {
- DeriveJunction::Hard(_) => true,
- _ => false,
- }
+ matches!(*self, DeriveJunction::Hard(_))
}
}
@@ -401,10 +395,7 @@ macro_rules! ss58_address_format {
/// Whether the address is custom.
pub fn is_custom(&self) -> bool {
- match self {
- Self::Custom(_) => true,
- _ => false,
- }
+ matches!(self, Self::Custom(_))
}
}
diff --git a/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs b/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
index c5d0073e3fb..d17067d990c 100644
--- a/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
+++ b/substrate/primitives/runtime-interface/proc-macro/src/runtime_interface/bare_function_interface.rs
@@ -239,8 +239,5 @@ fn generate_call_to_trait(
/// Returns if the given `Signature` takes a `self` argument.
fn takes_self_argument(sig: &Signature) -> bool {
- match sig.inputs.first() {
- Some(FnArg::Receiver(_)) => true,
- _ => false,
- }
+ matches!(sig.inputs.first(), Some(FnArg::Receiver(_)))
}
--
GitLab