greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

Pre: Do not re-export EdnParseError from core

Browse source
This commit is contained in:
Grisha Kruglov 2018-08-08 11:31:00 -07:00 committed by Grisha Kruglov
parent 07beb68c7a
commit 2ae8594d20
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/lib.rs
View file

@ -51,7 +51,6 @@ pub use edn::{
pub use edn::parse::{ pub use edn::parse::{
parse_query, parse_query,
ParseError as EdnParseError,
}; };
pub use cache::{ pub use cache::{

11
query-algebrizer/src/errors.rs
View file

@ -15,10 +15,13 @@ use core_traits::{
}; };
use mentat_core::{ use mentat_core::{
EdnParseError,
ValueTypeSet, ValueTypeSet,
}; };
use edn::parse::{
ParseError,
};
use edn::query::{ use edn::query::{
PlainSymbol, PlainSymbol,
}; };
@ -105,11 +108,11 @@ pub enum AlgebrizerError {
InvalidBinding(PlainSymbol, BindingError), InvalidBinding(PlainSymbol, BindingError),
#[fail(display = "{}", _0)] #[fail(display = "{}", _0)]
EdnParseError(#[cause] EdnParseError), EdnParseError(#[cause] ParseError),
} }
impl From<EdnParseError> for AlgebrizerError { impl From<ParseError> for AlgebrizerError {
fn from(error: EdnParseError) -> AlgebrizerError { fn from(error: ParseError) -> AlgebrizerError {
AlgebrizerError::EdnParseError(error) AlgebrizerError::EdnParseError(error)
} }
} }