From 666193dfc26181b6606cb85de5389c4ed6ece5eb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Mar 2020 18:57:42 +0100 Subject: Implement Into for Error Signed-off-by: Matthias Beyer --- lib/entry/libimagentryview/src/error.rs | 9 +++++++++ lib/entry/libimagentryview/src/viewer.rs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/entry/libimagentryview/src/error.rs b/lib/entry/libimagentryview/src/error.rs index be887549..5f45d7a0 100644 --- a/lib/entry/libimagentryview/src/error.rs +++ b/lib/entry/libimagentryview/src/error.rs @@ -46,3 +46,12 @@ impl From<::anyhow::Error> for Error { } } +impl Into<::anyhow::Error> for Error { + fn into(self) -> ::anyhow::Error { + match self { + Error::Io(e) => ::anyhow::Error::from(e), + Error::Other(e) => e, + } + } +} + diff --git a/lib/entry/libimagentryview/src/viewer.rs b/lib/entry/libimagentryview/src/viewer.rs index 5341e7ab..f4a9b3e0 100644 --- a/lib/entry/libimagentryview/src/viewer.rs +++ b/lib/entry/libimagentryview/src/viewer.rs @@ -140,7 +140,7 @@ impl<'a, I, V, W, F, T> Iterator for ViewIter<'a, I, V, W, F, T> } } - return Some(Err(Error::from(e))) + return Some(Err(e)) } } -- cgit v1.2.3