From 2ae8594d204b5637229e7f01d436453ffa62349a Mon Sep 17 00:00:00 2001
From: Grisha Kruglov <gkruglov@mozilla.com>
Date: Wed, 8 Aug 2018 11:31:00 -0700
Subject: [PATCH] Pre: Do not re-export EdnParseError from core

---
 core/src/lib.rs                |  1 -
 query-algebrizer/src/errors.rs | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/lib.rs b/core/src/lib.rs
index fc60b24b..183e6191 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -51,7 +51,6 @@ pub use edn::{
 
 pub use edn::parse::{
     parse_query,
-    ParseError as EdnParseError,
 };
 
 pub use cache::{
diff --git a/query-algebrizer/src/errors.rs b/query-algebrizer/src/errors.rs
index 7a3e3e99..e2cc4143 100644
--- a/query-algebrizer/src/errors.rs
+++ b/query-algebrizer/src/errors.rs
@@ -15,10 +15,13 @@ use core_traits::{
 };
 
 use mentat_core::{
-    EdnParseError,
     ValueTypeSet,
 };
 
+use edn::parse::{
+    ParseError,
+};
+
 use edn::query::{
     PlainSymbol,
 };
@@ -105,11 +108,11 @@ pub enum AlgebrizerError {
     InvalidBinding(PlainSymbol, BindingError),
 
     #[fail(display = "{}", _0)]
-    EdnParseError(#[cause] EdnParseError),
+    EdnParseError(#[cause] ParseError),
 }
 
-impl From<EdnParseError> for AlgebrizerError {
-    fn from(error: EdnParseError) -> AlgebrizerError {
+impl From<ParseError> for AlgebrizerError {
+    fn from(error: ParseError) -> AlgebrizerError {
         AlgebrizerError::EdnParseError(error)
     }
 }