From 34e34ef5f5ec489d5a3040bc866c5b49b9c3fc10 Mon Sep 17 00:00:00 2001
From: Jeff Bencin <jeff.bencin@gmail.com>
Date: Thu, 23 Jan 2025 13:56:01 -0500
Subject: [PATCH] chore: Apply Clippy lint `redundant_pattern_matching` again

---
 stackslib/src/chainstate/stacks/db/mod.rs          | 6 +++---
 stackslib/src/chainstate/stacks/index/test/marf.rs | 4 ++--
 stackslib/src/chainstate/stacks/tests/mod.rs       | 4 ++--
 stackslib/src/net/chat.rs                          | 2 +-
 stackslib/src/net/mod.rs                           | 2 +-
 stackslib/src/net/server.rs                        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/stackslib/src/chainstate/stacks/db/mod.rs b/stackslib/src/chainstate/stacks/db/mod.rs
index 1d7c97b676..5821f47394 100644
--- a/stackslib/src/chainstate/stacks/db/mod.rs
+++ b/stackslib/src/chainstate/stacks/db/mod.rs
@@ -2746,7 +2746,7 @@ pub mod test {
         balances: Vec<(StacksAddress, u64)>,
     ) -> StacksChainState {
         let path = chainstate_path(test_name);
-        if let Ok(_) = fs::metadata(&path) {
+        if fs::metadata(&path).is_ok() {
             fs::remove_dir_all(&path).unwrap();
         };
 
@@ -2863,7 +2863,7 @@ pub mod test {
         };
 
         let path = chainstate_path(function_name!());
-        if let Ok(_) = fs::metadata(&path) {
+        if fs::metadata(&path).is_ok() {
             fs::remove_dir_all(&path).unwrap();
         };
 
@@ -2950,7 +2950,7 @@ pub mod test {
         };
 
         let path = chainstate_path(function_name!());
-        if let Ok(_) = fs::metadata(&path) {
+        if fs::metadata(&path).is_ok() {
             fs::remove_dir_all(&path).unwrap();
         };
 
diff --git a/stackslib/src/chainstate/stacks/index/test/marf.rs b/stackslib/src/chainstate/stacks/index/test/marf.rs
index 7102527ba8..a721b2dce4 100644
--- a/stackslib/src/chainstate/stacks/index/test/marf.rs
+++ b/stackslib/src/chainstate/stacks/index/test/marf.rs
@@ -1282,7 +1282,7 @@ fn marf_insert_random_10485760_4096_file_storage() {
     }
 
     let path = "/tmp/rust_marf_insert_random_10485760_4096_file_storage".to_string();
-    if let Ok(_) = fs::metadata(&path) {
+    if fs::metadata(&path).is_ok() {
         fs::remove_dir_all(&path).unwrap();
     };
     let marf_opts = MARFOpenOpts::default();
@@ -1564,7 +1564,7 @@ fn marf_read_random_1048576_4096_file_storage() {
     for marf_opts in MARFOpenOpts::all().into_iter() {
         test_debug!("With {:?}", &marf_opts);
         let path = "/tmp/rust_marf_insert_random_1048576_4096_file_storage".to_string();
-        if let Err(_) = fs::metadata(&path) {
+        if fs::metadata(&path).is_err() {
             eprintln!("Run the marf_insert_random_1048576_4096_file_storage test first");
             return;
         };
diff --git a/stackslib/src/chainstate/stacks/tests/mod.rs b/stackslib/src/chainstate/stacks/tests/mod.rs
index d119dacd8e..29207dce6a 100644
--- a/stackslib/src/chainstate/stacks/tests/mod.rs
+++ b/stackslib/src/chainstate/stacks/tests/mod.rs
@@ -338,7 +338,7 @@ impl TestStacksNode {
             panic!("Tried to fork an unforkable chainstate instance");
         }
 
-        if let Ok(_) = fs::metadata(&chainstate_path(new_test_name)) {
+        if fs::metadata(&chainstate_path(new_test_name)).is_ok() {
             fs::remove_dir_all(&chainstate_path(new_test_name)).unwrap();
         }
 
@@ -1418,7 +1418,7 @@ pub fn instantiate_and_exec(
     post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx)>>,
 ) -> StacksChainState {
     let path = chainstate_path(test_name);
-    if let Ok(_) = fs::metadata(&path) {
+    if fs::metadata(&path).is_ok() {
         fs::remove_dir_all(&path).unwrap();
     };
 
diff --git a/stackslib/src/net/chat.rs b/stackslib/src/net/chat.rs
index 0ce27038cd..8fcc7cdf41 100644
--- a/stackslib/src/net/chat.rs
+++ b/stackslib/src/net/chat.rs
@@ -3106,7 +3106,7 @@ mod test {
         services: u16,
     ) -> (PeerDB, SortitionDB, StackerDBs, PoxId, StacksChainState) {
         let test_path = format!("/tmp/stacks-test-databases-{}", testname);
-        if let Ok(_) = fs::metadata(&test_path) {
+        if fs::metadata(&test_path).is_ok() {
             fs::remove_dir_all(&test_path).unwrap();
         };
 
diff --git a/stackslib/src/net/mod.rs b/stackslib/src/net/mod.rs
index a2461631a6..0959d2ff35 100644
--- a/stackslib/src/net/mod.rs
+++ b/stackslib/src/net/mod.rs
@@ -2793,7 +2793,7 @@ pub mod test {
 
         pub fn make_test_path(config: &TestPeerConfig) -> String {
             let test_path = TestPeer::test_path(&config);
-            if let Ok(_) = fs::metadata(&test_path) {
+            if fs::metadata(&test_path).is_ok() {
                 fs::remove_dir_all(&test_path).unwrap();
             };
 
diff --git a/stackslib/src/net/server.rs b/stackslib/src/net/server.rs
index 2459f64c00..05d831ca7a 100644
--- a/stackslib/src/net/server.rs
+++ b/stackslib/src/net/server.rs
@@ -726,7 +726,7 @@ mod test {
                 peer.step().unwrap();
 
                 // asked to yield?
-                if let Ok(_) = http_rx.try_recv() {
+                if http_rx.try_recv().is_ok() {
                     break;
                 }
             }