From d6569a6a228e3ab264a27aa9fe8676df5d0d10d5 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 27 Jun 2018 11:53:02 -0700
Subject: [PATCH] Convert query-pull/ to PullError.

---
 query-pull/src/errors.rs | 19 ++++++++++++++-----
 query-pull/src/lib.rs    |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/query-pull/src/errors.rs b/query-pull/src/errors.rs
index 628a1170..4ec4f221 100644
--- a/query-pull/src/errors.rs
+++ b/query-pull/src/errors.rs
@@ -10,15 +10,15 @@
 
 use std; // To refer to std::result::Result.
 
+use mentat_db::{
+    DbError,
+};
+
 use mentat_core::{
     Entid,
 };
 
-use failure::{
-    Error,
-};
-
-pub type Result<T> = std::result::Result<T, Error>;
+pub type Result<T> = std::result::Result<T, PullError>;
 
 #[derive(Debug, Fail)]
 pub enum PullError {
@@ -27,4 +27,13 @@ pub enum PullError {
 
     #[fail(display = ":db/id repeated")]
     RepeatedDbId,
+
+    #[fail(display = "{}", _0)]
+    DbError(#[cause] DbError),
+}
+
+impl From<DbError> for PullError {
+    fn from(error: DbError) -> PullError {
+        PullError::DbError(error)
+    }
 }
diff --git a/query-pull/src/lib.rs b/query-pull/src/lib.rs
index 22b48de6..39b6e903 100644
--- a/query-pull/src/lib.rs
+++ b/query-pull/src/lib.rs
@@ -102,7 +102,7 @@ use mentat_query::{
 
 pub mod errors;
 
-use errors::{
+pub use errors::{
     PullError,
     Result,
 };