Skip to content

Commit 34e34ef

Browse files
committed
chore: Apply Clippy lint redundant_pattern_matching again
1 parent da64cec commit 34e34ef

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

stackslib/src/chainstate/stacks/db/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2746,7 +2746,7 @@ pub mod test {
27462746
balances: Vec<(StacksAddress, u64)>,
27472747
) -> StacksChainState {
27482748
let path = chainstate_path(test_name);
2749-
if let Ok(_) = fs::metadata(&path) {
2749+
if fs::metadata(&path).is_ok() {
27502750
fs::remove_dir_all(&path).unwrap();
27512751
};
27522752

@@ -2863,7 +2863,7 @@ pub mod test {
28632863
};
28642864

28652865
let path = chainstate_path(function_name!());
2866-
if let Ok(_) = fs::metadata(&path) {
2866+
if fs::metadata(&path).is_ok() {
28672867
fs::remove_dir_all(&path).unwrap();
28682868
};
28692869

@@ -2950,7 +2950,7 @@ pub mod test {
29502950
};
29512951

29522952
let path = chainstate_path(function_name!());
2953-
if let Ok(_) = fs::metadata(&path) {
2953+
if fs::metadata(&path).is_ok() {
29542954
fs::remove_dir_all(&path).unwrap();
29552955
};
29562956

stackslib/src/chainstate/stacks/index/test/marf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ fn marf_insert_random_10485760_4096_file_storage() {
12821282
}
12831283

12841284
let path = "/tmp/rust_marf_insert_random_10485760_4096_file_storage".to_string();
1285-
if let Ok(_) = fs::metadata(&path) {
1285+
if fs::metadata(&path).is_ok() {
12861286
fs::remove_dir_all(&path).unwrap();
12871287
};
12881288
let marf_opts = MARFOpenOpts::default();
@@ -1564,7 +1564,7 @@ fn marf_read_random_1048576_4096_file_storage() {
15641564
for marf_opts in MARFOpenOpts::all().into_iter() {
15651565
test_debug!("With {:?}", &marf_opts);
15661566
let path = "/tmp/rust_marf_insert_random_1048576_4096_file_storage".to_string();
1567-
if let Err(_) = fs::metadata(&path) {
1567+
if fs::metadata(&path).is_err() {
15681568
eprintln!("Run the marf_insert_random_1048576_4096_file_storage test first");
15691569
return;
15701570
};

stackslib/src/chainstate/stacks/tests/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ impl TestStacksNode {
338338
panic!("Tried to fork an unforkable chainstate instance");
339339
}
340340

341-
if let Ok(_) = fs::metadata(&chainstate_path(new_test_name)) {
341+
if fs::metadata(&chainstate_path(new_test_name)).is_ok() {
342342
fs::remove_dir_all(&chainstate_path(new_test_name)).unwrap();
343343
}
344344

@@ -1418,7 +1418,7 @@ pub fn instantiate_and_exec(
14181418
post_flight_callback: Option<Box<dyn FnOnce(&mut ClarityTx)>>,
14191419
) -> StacksChainState {
14201420
let path = chainstate_path(test_name);
1421-
if let Ok(_) = fs::metadata(&path) {
1421+
if fs::metadata(&path).is_ok() {
14221422
fs::remove_dir_all(&path).unwrap();
14231423
};
14241424

stackslib/src/net/chat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3106,7 +3106,7 @@ mod test {
31063106
services: u16,
31073107
) -> (PeerDB, SortitionDB, StackerDBs, PoxId, StacksChainState) {
31083108
let test_path = format!("/tmp/stacks-test-databases-{}", testname);
3109-
if let Ok(_) = fs::metadata(&test_path) {
3109+
if fs::metadata(&test_path).is_ok() {
31103110
fs::remove_dir_all(&test_path).unwrap();
31113111
};
31123112

stackslib/src/net/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2793,7 +2793,7 @@ pub mod test {
27932793

27942794
pub fn make_test_path(config: &TestPeerConfig) -> String {
27952795
let test_path = TestPeer::test_path(&config);
2796-
if let Ok(_) = fs::metadata(&test_path) {
2796+
if fs::metadata(&test_path).is_ok() {
27972797
fs::remove_dir_all(&test_path).unwrap();
27982798
};
27992799

stackslib/src/net/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ mod test {
726726
peer.step().unwrap();
727727

728728
// asked to yield?
729-
if let Ok(_) = http_rx.try_recv() {
729+
if http_rx.try_recv().is_ok() {
730730
break;
731731
}
732732
}

0 commit comments

Comments
 (0)