From eb02100d68895cbc4b5a7b41b2a56034a01b114b Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Sun, 1 Dec 2019 21:40:56 +0100
Subject: [PATCH] fix(imap): merge error conversions properly

---
 src/imap.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/imap.rs b/src/imap.rs
index a0295b419..49f12b460 100644
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -74,7 +74,7 @@ pub enum Error {
     InTeardown,
 
     #[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)]
     WrappedError(#[cause] crate::error::Error),
@@ -83,8 +83,8 @@ pub enum Error {
     Other(String),
 }
 
-impl From<rusqlite::Error> for Error {
-    fn from(err: rusqlite::Error) -> Error {
+impl From<crate::sql::Error> for Error {
+    fn from(err: crate::sql::Error) -> Error {
         Error::SqlError(err)
     }
 }