Fix the new clippy error match_like_matches_macro

Author: Junha Yang

core/src/consensus/tendermint/types.rs

@@ -75,12 +75,10 @@ impl TendermintState {
     }
 
     pub fn is_propose_wait_empty_block_timer(&self) -> bool {
-        match self {
-            TendermintState::ProposeWaitEmptyBlockTimer {
-                ..
-            } => true,
-            _ => false,
-        }
+        matches!(self,
+        TendermintState::ProposeWaitEmptyBlockTimer {
+            ..
+        })
     }
 
     pub fn is_commit(&self) -> bool {
@@ -96,12 +94,10 @@ impl TendermintState {
     }
 
     pub fn is_commit_timedout(&self) -> bool {
-        match self {
-            TendermintState::CommitTimedout {
-                ..
-            } => true,
-            _ => false,
-        }
+        matches! (self,
+        TendermintState::CommitTimedout {
+            ..
+        })
     }
 
     pub fn committed(&self) -> Option<(View, BlockHash)> {
@@ -330,9 +326,6 @@ impl Proposal {
     }
 
     pub fn is_none(&self) -> bool {
-        match self {
-            Proposal::None => true,
-            _ => false,
-        }
+        matches!(self, Proposal::None)
     }
 }

core/src/consensus/tendermint/vote_regression_checker.rs

@@ -14,10 +14,7 @@ impl VoteRegressionChecker {
 
     pub fn check(&mut self, vote_on: &VoteOn) -> bool {
         assert!(
-            match vote_on.step.step {
-                Step::Propose | Step::Prevote | Step::Precommit => true,
-                _ => false,
-            },
+            matches!(vote_on.step.step, Step::Propose | Step::Prevote | Step::Precommit),
             "We don't vote on Commit. Check your code"
         );
 

informer/src/informer_service/informer_service_handler.rs

@@ -129,10 +129,7 @@ impl InformerService {
     }
 
     fn compare_event_types(tag: &EventTags, event: &Events) -> bool {
-        match (tag, event) {
-            (EventTags::PeerAdded, Events::PeerAdded(..)) => true,
-            _ => false,
-        }
+        matches!((tag, event), (EventTags::PeerAdded, Events::PeerAdded(..)))
     }
 
     pub fn notify_client(&self, popup_event: Events) {

network/src/routing_table.rs

@@ -136,10 +136,7 @@ impl RoutingTable {
 
     pub fn is_banned(&self, target: &SocketAddr) -> bool {
         let entries = self.entries.read();
-        match entries.get(target) {
-            Some(State::Banned) => true,
-            _ => false,
-        }
+        matches!(entries.get(target), Some(State::Banned))
     }
 
     pub fn is_establishing_or_established(&self, target: &SocketAddr) -> bool {
@@ -160,14 +157,12 @@ impl RoutingTable {
 
     pub fn is_established(&self, target: &SocketAddr) -> bool {
         let entries = self.entries.read();
-        if let Some(State::Established {
-            ..
-        }) = entries.get(target)
-        {
-            true
-        } else {
-            false
-        }
+        matches!(
+            entries.get(target),
+            Some(State::Established {
+                ..
+            })
+        )
     }
 
     pub fn is_establishing(&self, target: &SocketAddr) -> bool {
@@ -589,14 +584,7 @@ impl RoutingTable {
         let entry = entries.entry(target).or_default();
         let mut new_state = State::Banned;
         std::mem::swap(&mut new_state, entry);
-        if let State::Established {
-            ..
-        } = new_state
-        {
-            true
-        } else {
-            false
-        }
+        matches!(new_state, State::Established {..})
     }
 
     pub fn unban(&self, target: SocketAddr) -> bool {

sync/src/block/extension.rs

@@ -350,12 +350,7 @@ impl Extension {
 
         self.check_sync_variable();
         if let Some(requests) = self.requests.get_mut(id) {
-            let have_body_request = {
-                requests.iter().any(|r| match r {
-                    (_, RequestMessage::Bodies(..)) => true,
-                    _ => false,
-                })
-            };
+            let have_body_request = { requests.iter().any(|r| matches!(r, (_, RequestMessage::Bodies(..)))) };
             if have_body_request {
                 cdebug!(SYNC, "Wait body response");
                 return
@@ -382,10 +377,8 @@ impl Extension {
     }
 
     fn send_chunk_request(&mut self, block: &BlockHash, root: &H256) {
-        let have_chunk_request = self.requests.values().flatten().any(|r| match r {
-            (_, RequestMessage::StateChunk(..)) => true,
-            _ => false,
-        });
+        let have_chunk_request =
+            self.requests.values().flatten().any(|r| matches!(r, (_, RequestMessage::StateChunk(..))));
 
         if !have_chunk_request {
             let mut peer_ids: Vec<_> = self.header_downloaders.keys().cloned().collect();

util/timer/src/timer.rs

@@ -503,10 +503,7 @@ impl ScheduleStateControl {
 
     fn is_cancelled(&self) -> bool {
         let state = self.state.read();
-        match *state {
-            ScheduleState::Cancelled => true,
-            _ => false,
-        }
+        matches!(*state, ScheduleState::Cancelled)
     }
 
     fn within_lock<F, T>(&self, mut callback: F) -> T