From e9a89be939acf22cf17e3d6bc505a968a98d3dee Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Sun, 30 Aug 2020 18:43:31 +0200
Subject: Remove custom source implementation for Error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch removes the custom implementation of the source method of the
std::error::Error trait for the error::Error type.  This means that the
default implementation is used that always returns None.  The reason for
this change is that we already print the error message of the source
error in the Display implementation.  This leads to a duplicated error
message if both Display and source are checked, for example with
anyhow’s error formatting.

See this thread for more information:
	https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C6e0b4dc8-9059-a113-e98e-b49e52818c75%40posteo.net%3E
---
 src/error.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/error.rs b/src/error.rs
index 1aa1793..64a2ce0 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -91,21 +91,7 @@ impl<'a, T: device::Device<'a>> From<(T, Error)> for Error {
     }
 }
 
-impl error::Error for Error {
-    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-        match *self {
-            Error::CommandError(ref err) => Some(err),
-            Error::CommunicationError(ref err) => Some(err),
-            Error::ConcurrentAccessError => None,
-            Error::LibraryError(ref err) => Some(err),
-            Error::PoisonError => None,
-            Error::UnexpectedError(_) => None,
-            Error::UnknownError(_) => None,
-            Error::UnsupportedModelError => None,
-            Error::Utf8Error(ref err) => Some(err),
-        }
-    }
-}
+impl error::Error for Error {}
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-- 
cgit v1.2.1


From b2607cbd3f239be9d09204921db278424cc7a6be Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Sun, 30 Aug 2020 18:52:15 +0200
Subject: Use map_err(|_| x) instead of or_else(|_| Err(x))

---
 src/util.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/util.rs b/src/util.rs
index b17b071..26942cf 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -99,7 +99,7 @@ pub fn generate_password(length: usize) -> Result<CString, Error> {
 }
 
 pub fn get_cstring<T: Into<Vec<u8>>>(s: T) -> Result<CString, Error> {
-    CString::new(s).or_else(|_| Err(LibraryError::InvalidString.into()))
+    CString::new(s).map_err(|_| LibraryError::InvalidString.into())
 }
 
 impl Into<i32> for LogLevel {
-- 
cgit v1.2.1