diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2020-02-03 12:59:37 +0100 |
|---|---|---|
| committer | Robin Krahl <robin.krahl@ireas.org> | 2020-02-03 12:59:37 +0100 |
| commit | a3dd6afb8c23c8975737d1484e152d530a975c11 (patch) | |
| tree | 83c94299f3e8efdf288a569ea36e25a053b8d4f3 /src/error.rs | |
| parent | 3bdc550ce31aa9a8aaec13b4901e8517d34272be (diff) | |
| parent | 2a8ce725407f32db5ad61c37475719737c9b5c9c (diff) | |
| download | nitrokey-rs-a3dd6afb8c23c8975737d1484e152d530a975c11.tar.gz nitrokey-rs-a3dd6afb8c23c8975737d1484e152d530a975c11.tar.bz2 | |
Merge branch 'release-0.6.0'
Diffstat (limited to 'src/error.rs')
| -rw-r--r-- | src/error.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/error.rs b/src/error.rs index f9af594..7bea3f2 100644 --- a/src/error.rs +++ b/src/error.rs @@ -25,7 +25,7 @@ pub enum Error { /// An error that occurred during random number generation. RandError(Box<dyn error::Error>), /// An error that is caused by an unexpected value returned by libnitrokey. - UnexpectedError, + UnexpectedError(String), /// An unknown error returned by libnitrokey. UnknownError(i64), /// An error caused by a Nitrokey model that is not supported by this crate. @@ -102,7 +102,7 @@ impl error::Error for Error { Error::LibraryError(ref err) => Some(err), Error::PoisonError(ref err) => Some(err), Error::RandError(ref err) => Some(err.as_ref()), - Error::UnexpectedError => None, + Error::UnexpectedError(_) => None, Error::UnknownError(_) => None, Error::UnsupportedModelError => None, Error::Utf8Error(ref err) => Some(err), @@ -119,7 +119,7 @@ impl fmt::Display for Error { Error::LibraryError(ref err) => write!(f, "Library error: {}", err), Error::PoisonError(_) => write!(f, "Internal error: poisoned lock"), Error::RandError(ref err) => write!(f, "RNG error: {}", err), - Error::UnexpectedError => write!(f, "An unexpected error occurred"), + Error::UnexpectedError(ref s) => write!(f, "An unexpected error occurred: {}", s), Error::UnknownError(ref err) => write!(f, "Unknown error: {}", err), Error::UnsupportedModelError => write!(f, "Unsupported Nitrokey model"), Error::Utf8Error(ref err) => write!(f, "UTF-8 error: {}", err), |