fix(imap): merge error conversions properly

This commit is contained in:
dignifiedquire
2019-12-01 21:40:56 +01:00
parent ee18d60644
commit eb02100d68

View File

@@ -74,7 +74,7 @@ pub enum Error {
InTeardown, InTeardown,
#[fail(display = "IMAP operation attempted while it is torn down")] #[fail(display = "IMAP operation attempted while it is torn down")]
SqlError(#[cause] rusqlite::Error), SqlError(#[cause] crate::sql::Error),
#[fail(display = "IMAP got error from elsewhere: {:?}", _0)] #[fail(display = "IMAP got error from elsewhere: {:?}", _0)]
WrappedError(#[cause] crate::error::Error), WrappedError(#[cause] crate::error::Error),
@@ -83,8 +83,8 @@ pub enum Error {
Other(String), Other(String),
} }
impl From<rusqlite::Error> for Error { impl From<crate::sql::Error> for Error {
fn from(err: rusqlite::Error) -> Error { fn from(err: crate::sql::Error) -> Error {
Error::SqlError(err) Error::SqlError(err)
} }
} }