From 6567d38e23b77bfc58685d25990a7e51f2d8c28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 27 Dec 2020 22:37:21 +0000 Subject: [PATCH] remove redundant error conversion --- scripts/test.sh | 1 + src/index/lock.rs | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index b0e86e8..d02fadd 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -8,5 +8,6 @@ fi cargo fmt -- --check cargo clippy --all-targets --all-features -- -D warnings cargo check --frozen +cargo test --all-targets cargo test --all-targets --all-features cargo test --all-targets --all-features -- --ignored diff --git a/src/index/lock.rs b/src/index/lock.rs index 7323aee..53e5ebd 100644 --- a/src/index/lock.rs +++ b/src/index/lock.rs @@ -108,8 +108,6 @@ mod must { use super::Lock; use anyhow::Result; - #[cfg(feature = "failpoints")] - use anyhow::*; #[cfg(feature = "failpoints")] use fail::FailScenario; #[cfg(feature = "failpoints")] @@ -133,7 +131,7 @@ mod must { #[test] fn be_able_to_lock_when_creating_lock_file_fails_sometimes() { let scenario = FailScenario::setup(); - fail::cfg("create-lock-file", "90%10*return(some lock file creation error)->off").map_err(|e| anyhow!(e)).unwrap(); + fail::cfg("create-lock-file", "90%10*return(some lock file creation error)->off").unwrap(); { let path = MemoryFS::new().into(); @@ -150,7 +148,7 @@ mod must { #[test] fn know_to_give_up_when_creating_lock_file_always_fails() { let scenario = FailScenario::setup(); - fail::cfg("create-lock-file", "return(persistent lock file creation error)").map_err(|e| anyhow!(e)).unwrap(); + fail::cfg("create-lock-file", "return(persistent lock file creation error)").unwrap(); let path = MemoryFS::new().into(); assert!(Lock::lock_with_timeout(&path, 1).is_err());