From b00bbaa5603504597729ed2ce0d1e8ff50ea078d Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Wed, 23 Jan 2019 04:36:57 +0000
Subject: Implement From<(T: Device, Error)> for Error

Not all users of the authenticate methods want to use the device after
an error, so implementing From<(T: Device, Error)> for Error makes it
easier for them to discard the device.
---
 src/error.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/error.rs b/src/error.rs
index 4b82c6e..551dd0f 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -4,6 +4,8 @@ use std::os::raw;
 use std::result;
 use std::str;
 
+use crate::device;
+
 /// An error returned by the nitrokey crate.
 #[derive(Debug)]
 pub enum Error {
@@ -67,6 +69,12 @@ impl From<str::Utf8Error> for Error {
     }
 }
 
+impl<T: device::Device> From<(T, Error)> for Error {
+    fn from((_, err): (T, Error)) -> Self {
+        err
+    }
+}
+
 impl error::Error for Error {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match *self {
-- 
cgit v1.2.3