From 2011a7adfa1958af2d528c1692a9869aa5791ee9 Mon Sep 17 00:00:00 2001 From: Shiv <91686009+HelloShiv@users.noreply.github.com> Date: Fri, 7 Apr 2023 12:26:17 +0530 Subject: [PATCH] implemented assert! for resolving warning panic! (#227) * implemented assert! for resolving warning panic! --- src/find/matchers/lname.rs | 16 ++++--- src/find/matchers/name.rs | 16 ++++--- src/find/matchers/printf.rs | 72 +++++++++++++++++++------------ src/find/matchers/type_matcher.rs | 32 ++++++++------ src/find/mod.rs | 16 ++++--- tests/find_cmd_tests.rs | 32 ++++++++------ 6 files changed, 115 insertions(+), 69 deletions(-) diff --git a/src/find/matchers/lname.rs b/src/find/matchers/lname.rs index 58c130e..7a26f6d 100644 --- a/src/find/matchers/lname.rs +++ b/src/find/matchers/lname.rs @@ -73,15 +73,19 @@ mod tests { fn create_file_link() { #[cfg(unix)] if let Err(e) = symlink("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } #[cfg(windows)] if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } } diff --git a/src/find/matchers/name.rs b/src/find/matchers/name.rs index 94d8eb9..d21f848 100644 --- a/src/find/matchers/name.rs +++ b/src/find/matchers/name.rs @@ -47,15 +47,19 @@ mod tests { fn create_file_link() { #[cfg(unix)] if let Err(e) = symlink("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } #[cfg(windows)] if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } } diff --git a/src/find/matchers/printf.rs b/src/find/matchers/printf.rs index a576f88..2873d2e 100644 --- a/src/find/matchers/printf.rs +++ b/src/find/matchers/printf.rs @@ -946,52 +946,70 @@ mod tests { #[cfg(unix)] { if let Err(e) = symlink("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink("subdir", "test_data/links/link-d") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink("missing", "test_data/links/link-missing") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink("abbbc/x", "test_data/links/link-notdir") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink("link-loop", "test_data/links/link-loop") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } } #[cfg(windows)] { if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_dir("subdir", "test_data/links/link-d") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_file("missing", "test_data/links/link-missing") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_file("abbbc/x", "test_data/links/link-notdir") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } } diff --git a/src/find/matchers/type_matcher.rs b/src/find/matchers/type_matcher.rs index ad43a41..1da9569 100644 --- a/src/find/matchers/type_matcher.rs +++ b/src/find/matchers/type_matcher.rs @@ -110,27 +110,35 @@ mod tests { #[cfg(unix)] { if let Err(e) = symlink("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink("subdir", "test_data/links/link-d") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } }; #[cfg(windows)] let _ = { if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_dir("subdir", "test_data/links/link-d") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } }; diff --git a/src/find/mod.rs b/src/find/mod.rs index cc95053..bdccd0e 100644 --- a/src/find/mod.rs +++ b/src/find/mod.rs @@ -338,15 +338,19 @@ mod tests { fn create_file_link() { #[cfg(unix)] if let Err(e) = symlink("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } #[cfg(windows)] if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } } diff --git a/tests/find_cmd_tests.rs b/tests/find_cmd_tests.rs index b770d69..a38c26f 100644 --- a/tests/find_cmd_tests.rs +++ b/tests/find_cmd_tests.rs @@ -321,24 +321,32 @@ fn find_printf() { #[cfg(windows)] { if let Err(e) = symlink_file("abbbc", "test_data/links/link-f") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_dir("subdir", "test_data/links/link-d") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_file("missing", "test_data/links/link-missing") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } if let Err(e) = symlink_file("abbbc/x", "test_data/links/link-notdir") { - if e.kind() != ErrorKind::AlreadyExists { - panic!("Failed to create sym link: {:?}", e); - } + assert!( + e.kind() == ErrorKind::AlreadyExists, + "Failed to create sym link: {:?}", + e + ); } }