From 022f1e86714f1f5409612c125b7061f8c927d7b9 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Fri, 19 May 2017 23:48:06 -0400 Subject: [PATCH] Add Other variant for the Error type --- src/error.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/error.rs b/src/error.rs index 3ef8a2a..7c37c14 100644 --- a/src/error.rs +++ b/src/error.rs @@ -74,6 +74,9 @@ pub enum Error { #[cfg(feature = "functions")] #[allow(dead_code)] UserFunctionError(Box), + + /// Error available for the implementors of the `FromSql` trait. + Other(Box), } impl From for Error { @@ -128,6 +131,7 @@ impl fmt::Display for Error { } #[cfg(feature = "functions")] Error::UserFunctionError(ref err) => err.fmt(f), + Error::Other(ref err) => err.fmt(f), } } } @@ -159,6 +163,7 @@ impl error::Error for Error { Error::InvalidFunctionParameterType(_, _) => "invalid function parameter type", #[cfg(feature = "functions")] Error::UserFunctionError(ref err) => err.description(), + Error::Other(ref err) => err.description(), } } @@ -185,6 +190,7 @@ impl error::Error for Error { #[cfg(feature = "functions")] Error::UserFunctionError(ref err) => Some(&**err), + Error::Other(ref err) => Some(&**err), } } }