From 98b36813b2ce7789da5981920b672daa47be1c35 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/lock.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tests/lock.rs') diff --git a/src/tests/lock.rs b/src/tests/lock.rs index b29f394..cb4962c 100644 --- a/src/tests/lock.rs +++ b/src/tests/lock.rs @@ -1,7 +1,7 @@ // lock.rs // ************************************************************************* -// * Copyright (C) 2019 Daniel Mueller (deso@posteo.net) * +// * Copyright (C) 2019-2020 Daniel Mueller (deso@posteo.net) * // * * // * This program is free software: you can redistribute it and/or modify * // * it under the terms of the GNU General Public License as published by * @@ -20,7 +20,7 @@ use super::*; #[test_device(pro)] -fn lock_pro(model: nitrokey::Model) -> crate::Result<()> { +fn lock_pro(model: nitrokey::Model) -> anyhow::Result<()> { // We can't really test much more here than just success of the command. let out = Nitrocli::with_model(model).handle(&["lock"])?; assert!(out.is_empty()); @@ -29,7 +29,7 @@ fn lock_pro(model: nitrokey::Model) -> crate::Result<()> { } #[test_device(storage)] -fn lock_storage(model: nitrokey::Model) -> crate::Result<()> { +fn lock_storage(model: nitrokey::Model) -> anyhow::Result<()> { let mut ncli = Nitrocli::with_model(model); let _ = ncli.handle(&["encrypted", "open"])?; -- cgit v1.2.3