From efb6fbffdb96c6acd197b8a7c4fe0ed9855a151e Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Wed, 8 Jul 2020 09:16:56 -0700 Subject: Remove unwrap_str_err method from UnwrapError test trait With upcoming changes we intend to move towards a model where we do not distinguish the individual error variants the program deals with in a global enum. In preparation of such a change, this patch marks a first step in removing the UnwrapError test trait, which relies on the existence of exactly such typed errors. In particular, we remove the unwrap_str_err method from it, basically falling back to just working with strings. --- src/tests/mod.rs | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/tests/mod.rs') diff --git a/src/tests/mod.rs b/src/tests/mod.rs index abf63e3..fd2f9e0 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -37,8 +37,6 @@ mod unencrypted; /// A trait simplifying checking for expected errors. pub trait UnwrapError { - /// Unwrap an Error::Error variant. - fn unwrap_str_err(self) -> String; /// Unwrap a Error::CommandError variant. fn unwrap_cmd_err(self) -> (Option<&'static str>, nitrokey::CommandError); /// Unwrap a Error::LibraryError variant. @@ -49,20 +47,6 @@ impl UnwrapError for crate::Result where T: fmt::Debug, { - fn unwrap_str_err(self) -> String { - match self.unwrap_err() { - crate::Error::ClapError(err) => { - if err.use_stderr() { - err.message - } else { - String::new() - } - } - crate::Error::Error(err) => err, - err => panic!("Unexpected error variant found: {:?}", err), - } - } - fn unwrap_cmd_err(self) -> (Option<&'static str>, nitrokey::CommandError) { match self.unwrap_err() { crate::Error::NitrokeyError(ctx, err) => match err { -- cgit v1.2.1