From 67ba96eb7d592ac7c09b2221420c6f706ac89a13 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 31 Aug 2020 19:25:48 -0700 Subject: Remove application global Result definition In the past we were using an application global custom Result type definition. This makes less sense now that we switched over to using anyhow's Error and Result types. We kept that for the time being, but with this change we remove the type and use anyhow::Result instead. --- src/tests/pws.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tests/pws.rs') diff --git a/src/tests/pws.rs b/src/tests/pws.rs index 910ef92..238ce28 100644 --- a/src/tests/pws.rs +++ b/src/tests/pws.rs @@ -30,7 +30,7 @@ fn set_invalid_slot(model: nitrokey::Model) { } #[test_device] -fn status(model: nitrokey::Model) -> crate::Result<()> { +fn status(model: nitrokey::Model) -> anyhow::Result<()> { let re = regex::Regex::new( r#"^slot\tname (\d+\t.+\n)+$"#, @@ -48,7 +48,7 @@ fn status(model: nitrokey::Model) -> crate::Result<()> { } #[test_device] -fn set_get(model: nitrokey::Model) -> crate::Result<()> { +fn set_get(model: nitrokey::Model) -> anyhow::Result<()> { const NAME: &str = "dropbox"; const LOGIN: &str = "d-e-s-o"; const PASSWORD: &str = "my-secret-password"; @@ -80,7 +80,7 @@ fn set_get(model: nitrokey::Model) -> crate::Result<()> { } #[test_device] -fn set_reset_get(model: nitrokey::Model) -> crate::Result<()> { +fn set_reset_get(model: nitrokey::Model) -> anyhow::Result<()> { const NAME: &str = "some/svc"; const LOGIN: &str = "a\\user"; const PASSWORD: &str = "!@&-)*(&+%^@"; @@ -98,7 +98,7 @@ fn set_reset_get(model: nitrokey::Model) -> crate::Result<()> { } #[test_device] -fn clear(model: nitrokey::Model) -> crate::Result<()> { +fn clear(model: nitrokey::Model) -> anyhow::Result<()> { let mut ncli = Nitrocli::with_model(model); let _ = ncli.handle(&["pws", "set", "10", "clear-test", "some-login", "abcdef"])?; let _ = ncli.handle(&["pws", "clear", "10"])?; -- cgit v1.2.1