diff --git a/core-traits/lib.rs b/core-traits/lib.rs index dacf95e6..48b5cb45 100644 --- a/core-traits/lib.rs +++ b/core-traits/lib.rs @@ -81,6 +81,13 @@ pub use value_type_set::{ ValueTypeSet, }; +#[macro_export] +macro_rules! bail { + ($e:expr) => ( + return Err($e.into()); + ) +} + /// Represents one entid in the entid space. /// /// Per https://www.sqlite.org/datatype3.html (see also http://stackoverflow.com/a/8499544), SQLite diff --git a/db-traits/errors.rs b/db-traits/errors.rs index 2f6a8bb2..b03f3d2c 100644 --- a/db-traits/errors.rs +++ b/db-traits/errors.rs @@ -34,13 +34,6 @@ use core_traits::{ ValueType, }; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - pub type Result = ::std::result::Result; // TODO Error/ErrorKind pair diff --git a/db/src/lib.rs b/db/src/lib.rs index b316ad15..ef47275d 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -24,8 +24,8 @@ extern crate time; #[macro_use] extern crate edn; #[macro_use] extern crate mentat_core; -#[macro_use] extern crate db_traits; -extern crate core_traits; +extern crate db_traits; +#[macro_use] extern crate core_traits; extern crate mentat_sql; use std::iter::repeat; diff --git a/public-traits/errors.rs b/public-traits/errors.rs index a74b1851..2013ed71 100644 --- a/public-traits/errors.rs +++ b/public-traits/errors.rs @@ -44,13 +44,6 @@ use tolstoy_traits::errors::{ pub type Result = std::result::Result; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - #[derive(Debug, Fail)] pub enum MentatError { #[fail(display = "bad uuid {}", _0)] diff --git a/query-algebrizer-traits/errors.rs b/query-algebrizer-traits/errors.rs index 4e1db709..c1b360ef 100644 --- a/query-algebrizer-traits/errors.rs +++ b/query-algebrizer-traits/errors.rs @@ -25,13 +25,6 @@ use edn::query::{ pub type Result = std::result::Result; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - #[derive(Clone, Debug, Eq, PartialEq)] pub enum BindingError { NoBoundVariable, diff --git a/query-algebrizer/src/lib.rs b/query-algebrizer/src/lib.rs index c9a4a1a7..de2e9b97 100644 --- a/query-algebrizer/src/lib.rs +++ b/query-algebrizer/src/lib.rs @@ -12,8 +12,8 @@ extern crate failure; extern crate edn; extern crate mentat_core; -extern crate core_traits; #[macro_use] +extern crate core_traits; extern crate query_algebrizer_traits; use std::collections::BTreeSet; diff --git a/query-projector-traits/errors.rs b/query-projector-traits/errors.rs index 8dd38516..e53f80e3 100644 --- a/query-projector-traits/errors.rs +++ b/query-projector-traits/errors.rs @@ -27,13 +27,6 @@ use aggregates::{ SimpleAggregationOp, }; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - pub type Result = std::result::Result; #[derive(Debug, Fail)] diff --git a/query-projector-traits/lib.rs b/query-projector-traits/lib.rs index 01f315a6..30b14162 100644 --- a/query-projector-traits/lib.rs +++ b/query-projector-traits/lib.rs @@ -13,6 +13,7 @@ extern crate failure; extern crate failure_derive; extern crate rusqlite; +#[macro_use] extern crate core_traits; extern crate db_traits; extern crate edn; @@ -22,7 +23,6 @@ extern crate query_pull_traits; extern crate mentat_query_algebrizer; extern crate mentat_query_sql; -#[macro_use] pub mod errors; pub mod aggregates; diff --git a/query-projector/src/lib.rs b/query-projector/src/lib.rs index 0bb1ac46..335d1e38 100644 --- a/query-projector/src/lib.rs +++ b/query-projector/src/lib.rs @@ -16,12 +16,12 @@ extern crate rusqlite; extern crate edn; extern crate mentat_core; extern crate db_traits; +#[macro_use] extern crate core_traits; extern crate mentat_db; // For value conversion. extern crate mentat_query_algebrizer; extern crate mentat_query_pull; extern crate query_pull_traits; -#[macro_use] extern crate query_projector_traits; extern crate mentat_query_sql; extern crate mentat_sql; diff --git a/src/lib.rs b/src/lib.rs index 1d812f75..41be6d1b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,6 +21,7 @@ extern crate uuid; pub extern crate edn; extern crate mentat_core; +#[macro_use] extern crate core_traits; extern crate mentat_db; extern crate db_traits; @@ -32,7 +33,6 @@ extern crate mentat_query_pull; extern crate query_pull_traits; extern crate sql_traits; extern crate mentat_sql; -#[macro_use] extern crate public_traits; #[cfg(feature = "syncable")] diff --git a/tolstoy-traits/errors.rs b/tolstoy-traits/errors.rs index 82c2a0b2..6f9bcff9 100644 --- a/tolstoy-traits/errors.rs +++ b/tolstoy-traits/errors.rs @@ -16,13 +16,6 @@ use serde_json; use db_traits::errors::DbError; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - pub type Result = ::std::result::Result; #[derive(Debug, Fail)] diff --git a/tolstoy/src/lib.rs b/tolstoy/src/lib.rs index 95ada1f4..bed77332 100644 --- a/tolstoy/src/lib.rs +++ b/tolstoy/src/lib.rs @@ -33,11 +33,11 @@ extern crate serde_json; extern crate mentat_core; extern crate db_traits; +#[macro_use] extern crate core_traits; extern crate rusqlite; extern crate uuid; -#[macro_use] extern crate tolstoy_traits; pub mod schema; diff --git a/tools/cli/src/mentat_cli/command_parser.rs b/tools/cli/src/mentat_cli/command_parser.rs index 69de29e3..852e451a 100644 --- a/tools/cli/src/mentat_cli/command_parser.rs +++ b/tools/cli/src/mentat_cli/command_parser.rs @@ -43,13 +43,6 @@ use mentat::{ CacheDirection, }; -#[macro_export] -macro_rules! bail { - ($e:expr) => ( - return Err($e.into()); - ) -} - pub static COMMAND_CACHE: &'static str = &"cache"; pub static COMMAND_CLOSE: &'static str = &"close"; pub static COMMAND_EXIT_LONG: &'static str = &"exit"; diff --git a/tools/cli/src/mentat_cli/lib.rs b/tools/cli/src/mentat_cli/lib.rs index ac1129a5..40f74012 100644 --- a/tools/cli/src/mentat_cli/lib.rs +++ b/tools/cli/src/mentat_cli/lib.rs @@ -30,6 +30,7 @@ extern crate time; extern crate mentat; extern crate edn; +#[macro_use] extern crate core_traits; extern crate mentat_db;