From 07beb68c7aba13c30f7fc6309762debb601c93ee Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Wed, 8 Aug 2018 11:23:07 -0700 Subject: [PATCH] Pre: Remove query/ crate --- Cargo.toml | 3 --- query-algebrizer/Cargo.toml | 6 +++--- query-algebrizer/src/clauses/convert.rs | 2 +- query-algebrizer/src/clauses/fulltext.rs | 4 ++-- query-algebrizer/src/clauses/ground.rs | 4 ++-- query-algebrizer/src/clauses/inputs.rs | 2 +- query-algebrizer/src/clauses/mod.rs | 5 +---- query-algebrizer/src/clauses/not.rs | 4 ++-- query-algebrizer/src/clauses/or.rs | 4 ++-- query-algebrizer/src/clauses/pattern.rs | 4 ++-- query-algebrizer/src/clauses/predicate.rs | 4 ++-- query-algebrizer/src/clauses/resolve.rs | 2 +- query-algebrizer/src/clauses/tx_log_api.rs | 4 ++-- query-algebrizer/src/clauses/where_fn.rs | 2 +- query-algebrizer/src/errors.rs | 4 +--- query-algebrizer/src/lib.rs | 4 ++-- query-algebrizer/src/types.rs | 2 +- query-algebrizer/src/validate.rs | 6 +++--- query-algebrizer/tests/fulltext.rs | 4 ++-- query-algebrizer/tests/ground.rs | 4 ++-- query-algebrizer/tests/predicate.rs | 4 ++-- query-algebrizer/tests/type_reqs.rs | 2 +- query-algebrizer/tests/utils/mod.rs | 2 +- query-projector/Cargo.toml | 6 +++--- query-projector/src/aggregates.rs | 2 +- query-projector/src/errors.rs | 2 +- query-projector/src/lib.rs | 4 ++-- query-projector/src/project.rs | 2 +- query-projector/src/pull.rs | 2 +- query-projector/tests/aggregates.rs | 4 ++-- query-pull/Cargo.toml | 6 +++--- query-pull/src/lib.rs | 4 ++-- query-sql/Cargo.toml | 6 +++--- query-sql/src/lib.rs | 4 ++-- query-translator/Cargo.toml | 6 +++--- query-translator/src/lib.rs | 2 +- query-translator/src/translate.rs | 2 +- query-translator/tests/translate.rs | 4 ++-- query/Cargo.toml | 12 ------------ query/README.md | 4 ---- query/src/lib.rs | 12 ------------ src/errors.rs | 3 +-- src/lib.rs | 3 +-- src/query.rs | 4 ++-- tools/cli/Cargo.toml | 3 --- tools/cli/src/mentat_cli/lib.rs | 1 - 46 files changed, 69 insertions(+), 111 deletions(-) delete mode 100644 query/Cargo.toml delete mode 100644 query/README.md delete mode 100644 query/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index d5d7235b..5ea00d1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,9 +58,6 @@ path = "db" [dependencies.db_traits] path = "db-traits" -[dependencies.mentat_query] -path = "query" - [dependencies.mentat_query_algebrizer] path = "query-algebrizer" diff --git a/query-algebrizer/Cargo.toml b/query-algebrizer/Cargo.toml index 0ba96fa2..3dea8b3a 100644 --- a/query-algebrizer/Cargo.toml +++ b/query-algebrizer/Cargo.toml @@ -7,14 +7,14 @@ workspace = ".." failure = "0.1.1" failure_derive = "0.1.1" +[dependencies.edn] +path = "../edn" + [dependencies.mentat_core] path = "../core" [dependencies.core_traits] path = "../core-traits" -[dependencies.mentat_query] -path = "../query" - [dev-dependencies] itertools = "0.7" diff --git a/query-algebrizer/src/clauses/convert.rs b/query-algebrizer/src/clauses/convert.rs index a718048a..67bdc1e9 100644 --- a/query-algebrizer/src/clauses/convert.rs +++ b/query-algebrizer/src/clauses/convert.rs @@ -20,7 +20,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ FnArg, NonIntegerConstant, Variable, diff --git a/query-algebrizer/src/clauses/fulltext.rs b/query-algebrizer/src/clauses/fulltext.rs index a2f7532f..6039ce51 100644 --- a/query-algebrizer/src/clauses/fulltext.rs +++ b/query-algebrizer/src/clauses/fulltext.rs @@ -19,7 +19,7 @@ use mentat_core::{ use mentat_core::util::Either; -use mentat_query::{ +use edn::query::{ Binding, FnArg, NonIntegerConstant, @@ -273,7 +273,7 @@ mod testing { Schema, }; - use mentat_query::{ + use edn::query::{ Binding, FnArg, Keyword, diff --git a/query-algebrizer/src/clauses/ground.rs b/query-algebrizer/src/clauses/ground.rs index e9d14ab7..28d78700 100644 --- a/query-algebrizer/src/clauses/ground.rs +++ b/query-algebrizer/src/clauses/ground.rs @@ -18,7 +18,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ Binding, FnArg, Variable, @@ -332,7 +332,7 @@ mod testing { Attribute, }; - use mentat_query::{ + use edn::query::{ Binding, FnArg, Keyword, diff --git a/query-algebrizer/src/clauses/inputs.rs b/query-algebrizer/src/clauses/inputs.rs index 38b2eca4..798db510 100644 --- a/query-algebrizer/src/clauses/inputs.rs +++ b/query-algebrizer/src/clauses/inputs.rs @@ -15,7 +15,7 @@ use core_traits::{ TypedValue, }; -use mentat_query::{ +use edn::query::{ Variable, }; diff --git a/query-algebrizer/src/clauses/mod.rs b/query-algebrizer/src/clauses/mod.rs index 0692ef1e..8924e747 100644 --- a/query-algebrizer/src/clauses/mod.rs +++ b/query-algebrizer/src/clauses/mod.rs @@ -42,16 +42,13 @@ use mentat_core::{ use mentat_core::counter::RcCounter; -use mentat_query::{ +use edn::query::{ Element, FindSpec, Keyword, Pull, Variable, WhereClause, -}; - -use mentat_query::{ PatternNonValuePlace, }; diff --git a/query-algebrizer/src/clauses/not.rs b/query-algebrizer/src/clauses/not.rs index 53cfa7bc..1a40650e 100644 --- a/query-algebrizer/src/clauses/not.rs +++ b/query-algebrizer/src/clauses/not.rs @@ -8,7 +8,7 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. -use mentat_query::{ +use edn::query::{ ContainsVariables, NotJoin, UnifyVars, @@ -101,7 +101,7 @@ mod testing { ValueTypeSet, }; - use mentat_query::{ + use edn::query::{ Keyword, PlainSymbol, Variable diff --git a/query-algebrizer/src/clauses/or.rs b/query-algebrizer/src/clauses/or.rs index 1399e591..a6883ea7 100644 --- a/query-algebrizer/src/clauses/or.rs +++ b/query-algebrizer/src/clauses/or.rs @@ -18,7 +18,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ OrJoin, OrWhereClause, Pattern, @@ -763,7 +763,7 @@ mod testing { Schema, }; - use mentat_query::{ + use edn::query::{ Keyword, Variable, }; diff --git a/query-algebrizer/src/clauses/pattern.rs b/query-algebrizer/src/clauses/pattern.rs index fd494fdb..9809a5c9 100644 --- a/query-algebrizer/src/clauses/pattern.rs +++ b/query-algebrizer/src/clauses/pattern.rs @@ -20,7 +20,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ NonIntegerConstant, Pattern, PatternValuePlace, @@ -666,7 +666,7 @@ mod testing { ValueTypeSet, }; - use mentat_query::{ + use edn::query::{ Keyword, Variable, }; diff --git a/query-algebrizer/src/clauses/predicate.rs b/query-algebrizer/src/clauses/predicate.rs index f958e18f..5d1a7190 100644 --- a/query-algebrizer/src/clauses/predicate.rs +++ b/query-algebrizer/src/clauses/predicate.rs @@ -17,7 +17,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ FnArg, PlainSymbol, Predicate, @@ -199,7 +199,7 @@ mod testing { Attribute, }; - use mentat_query::{ + use edn::query::{ FnArg, Keyword, Pattern, diff --git a/query-algebrizer/src/clauses/resolve.rs b/query-algebrizer/src/clauses/resolve.rs index 648a9e1a..dbb877c5 100644 --- a/query-algebrizer/src/clauses/resolve.rs +++ b/query-algebrizer/src/clauses/resolve.rs @@ -18,7 +18,7 @@ use mentat_core::{ Schema, }; -use mentat_query::{ +use edn::query::{ FnArg, NonIntegerConstant, PlainSymbol, diff --git a/query-algebrizer/src/clauses/tx_log_api.rs b/query-algebrizer/src/clauses/tx_log_api.rs index e4ea4985..c502a788 100644 --- a/query-algebrizer/src/clauses/tx_log_api.rs +++ b/query-algebrizer/src/clauses/tx_log_api.rs @@ -12,7 +12,7 @@ use core_traits::{ ValueType, }; -use mentat_query::{ +use edn::query::{ Binding, FnArg, SrcVar, @@ -257,7 +257,7 @@ mod testing { Schema, }; - use mentat_query::{ + use edn::query::{ Binding, FnArg, PlainSymbol, diff --git a/query-algebrizer/src/clauses/where_fn.rs b/query-algebrizer/src/clauses/where_fn.rs index 845a6a64..3679bbab 100644 --- a/query-algebrizer/src/clauses/where_fn.rs +++ b/query-algebrizer/src/clauses/where_fn.rs @@ -8,7 +8,7 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. -use mentat_query::{ +use edn::query::{ WhereFn, }; diff --git a/query-algebrizer/src/errors.rs b/query-algebrizer/src/errors.rs index 085763e5..7a3e3e99 100644 --- a/query-algebrizer/src/errors.rs +++ b/query-algebrizer/src/errors.rs @@ -8,8 +8,6 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. -extern crate mentat_query; - use std; // To refer to std::result::Result. use core_traits::{ @@ -21,7 +19,7 @@ use mentat_core::{ ValueTypeSet, }; -use self::mentat_query::{ +use edn::query::{ PlainSymbol, }; diff --git a/query-algebrizer/src/lib.rs b/query-algebrizer/src/lib.rs index 9d63e537..5508dcf0 100644 --- a/query-algebrizer/src/lib.rs +++ b/query-algebrizer/src/lib.rs @@ -12,9 +12,9 @@ extern crate failure; #[macro_use] extern crate failure_derive; +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; use std::collections::BTreeSet; use std::ops::Sub; @@ -40,7 +40,7 @@ use mentat_core::{ use mentat_core::counter::RcCounter; -use mentat_query::{ +use edn::query::{ Element, FindSpec, Limit, diff --git a/query-algebrizer/src/types.rs b/query-algebrizer/src/types.rs index 16df8cbb..5a981b9a 100644 --- a/query-algebrizer/src/types.rs +++ b/query-algebrizer/src/types.rs @@ -25,7 +25,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ Direction, FindSpec, Keyword, diff --git a/query-algebrizer/src/validate.rs b/query-algebrizer/src/validate.rs index 1dba97fb..0e6c00cb 100644 --- a/query-algebrizer/src/validate.rs +++ b/query-algebrizer/src/validate.rs @@ -10,7 +10,7 @@ use std::collections::BTreeSet; -use mentat_query::{ +use edn::query::{ ContainsVariables, OrJoin, NotJoin, @@ -95,9 +95,9 @@ pub(crate) fn validate_not_join(not_join: &NotJoin) -> Result<()> { #[cfg(test)] mod tests { extern crate mentat_core; - extern crate mentat_query; + extern crate edn; - use self::mentat_query::{ + use edn::query::{ Keyword, OrWhereClause, Pattern, diff --git a/query-algebrizer/tests/fulltext.rs b/query-algebrizer/tests/fulltext.rs index 6bb224a3..691c9d51 100644 --- a/query-algebrizer/tests/fulltext.rs +++ b/query-algebrizer/tests/fulltext.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; mod utils; @@ -24,7 +24,7 @@ use mentat_core::{ Schema, }; -use mentat_query::{ +use edn::query::{ Keyword, }; diff --git a/query-algebrizer/tests/ground.rs b/query-algebrizer/tests/ground.rs index 5cce5cd1..82aadf2c 100644 --- a/query-algebrizer/tests/ground.rs +++ b/query-algebrizer/tests/ground.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; mod utils; @@ -27,7 +27,7 @@ use mentat_core::{ Schema, }; -use mentat_query::{ +use edn::query::{ Keyword, PlainSymbol, Variable, diff --git a/query-algebrizer/tests/predicate.rs b/query-algebrizer/tests/predicate.rs index c85a9b07..65081d5e 100644 --- a/query-algebrizer/tests/predicate.rs +++ b/query-algebrizer/tests/predicate.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; mod utils; @@ -28,7 +28,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ Keyword, PlainSymbol, Variable, diff --git a/query-algebrizer/tests/type_reqs.rs b/query-algebrizer/tests/type_reqs.rs index e87b641f..b7f3d555 100644 --- a/query-algebrizer/tests/type_reqs.rs +++ b/query-algebrizer/tests/type_reqs.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate core_traits; extern crate mentat_core; -extern crate mentat_query; extern crate mentat_query_algebrizer; mod utils; diff --git a/query-algebrizer/tests/utils/mod.rs b/query-algebrizer/tests/utils/mod.rs index 1138e8c4..213bfc63 100644 --- a/query-algebrizer/tests/utils/mod.rs +++ b/query-algebrizer/tests/utils/mod.rs @@ -23,7 +23,7 @@ use mentat_core::{ Schema, }; -use mentat_query::{ +use edn::query::{ Keyword, }; diff --git a/query-projector/Cargo.toml b/query-projector/Cargo.toml index 571989f5..b993d3e9 100644 --- a/query-projector/Cargo.toml +++ b/query-projector/Cargo.toml @@ -15,6 +15,9 @@ features = ["limits"] [dependencies.core_traits] path = "../core-traits" +[dependencies.edn] +path = "../edn" + [dependencies.mentat_core] path = "../core" @@ -27,9 +30,6 @@ path = "../db-traits" [dependencies.mentat_sql] path = "../sql" -[dependencies.mentat_query] -path = "../query" - [dependencies.mentat_query_algebrizer] path = "../query-algebrizer" diff --git a/query-projector/src/aggregates.rs b/query-projector/src/aggregates.rs index bfe80564..bb4ec590 100644 --- a/query-projector/src/aggregates.rs +++ b/query-projector/src/aggregates.rs @@ -16,7 +16,7 @@ use mentat_core::{ ValueTypeSet, }; -use mentat_query::{ +use edn::query::{ Aggregate, QueryFunction, Variable, diff --git a/query-projector/src/errors.rs b/query-projector/src/errors.rs index ae719242..b9b37808 100644 --- a/query-projector/src/errors.rs +++ b/query-projector/src/errors.rs @@ -16,7 +16,7 @@ use mentat_core::{ ValueTypeSet, }; use db_traits::errors::DbError; -use mentat_query::{ +use edn::query::{ PlainSymbol, }; use query_pull_traits::errors::{ diff --git a/query-projector/src/lib.rs b/query-projector/src/lib.rs index 57336b5d..1de16b86 100644 --- a/query-projector/src/lib.rs +++ b/query-projector/src/lib.rs @@ -15,11 +15,11 @@ extern crate failure_derive; extern crate indexmap; extern crate rusqlite; +extern crate edn; extern crate mentat_core; extern crate db_traits; extern crate core_traits; extern crate mentat_db; // For value conversion. -extern crate mentat_query; extern crate mentat_query_algebrizer; extern crate mentat_query_pull; extern crate query_pull_traits; @@ -58,7 +58,7 @@ use mentat_db::{ TypedSQLValue, }; -use mentat_query::{ +use edn::query::{ Element, FindSpec, Limit, diff --git a/query-projector/src/project.rs b/query-projector/src/project.rs index 92d43433..dd1ee063 100644 --- a/query-projector/src/project.rs +++ b/query-projector/src/project.rs @@ -26,7 +26,7 @@ use mentat_core::util::{ Either, }; -use mentat_query::{ +use edn::query::{ Element, Pull, Variable, diff --git a/query-projector/src/pull.rs b/query-projector/src/pull.rs index 082a46c1..dc66028e 100644 --- a/query-projector/src/pull.rs +++ b/query-projector/src/pull.rs @@ -25,7 +25,7 @@ use mentat_core::{ ValueRc, }; -use mentat_query::{ +use edn::query::{ PullAttributeSpec, }; diff --git a/query-projector/tests/aggregates.rs b/query-projector/tests/aggregates.rs index 8b5e37cb..84c13743 100644 --- a/query-projector/tests/aggregates.rs +++ b/query-projector/tests/aggregates.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; extern crate mentat_query_projector; @@ -24,7 +24,7 @@ use mentat_core::{ Schema, }; -use mentat_query::{ +use edn::query::{ Keyword, }; diff --git a/query-pull/Cargo.toml b/query-pull/Cargo.toml index 299f2860..f81932c7 100644 --- a/query-pull/Cargo.toml +++ b/query-pull/Cargo.toml @@ -13,6 +13,9 @@ path = "../query-pull-traits" version = "0.13" features = ["limits"] +[dependencies.edn] +path = "../edn" + [dependencies.mentat_core] path = "../core" @@ -25,9 +28,6 @@ path = "../db" [dependencies.db_traits] path = "../db-traits" -[dependencies.mentat_query] -path = "../query" - [dependencies.mentat_query_algebrizer] path = "../query-algebrizer" diff --git a/query-pull/src/lib.rs b/query-pull/src/lib.rs index 213822bf..73ccdbe0 100644 --- a/query-pull/src/lib.rs +++ b/query-pull/src/lib.rs @@ -60,11 +60,11 @@ extern crate failure; extern crate rusqlite; +extern crate edn; extern crate mentat_core; extern crate core_traits; extern crate mentat_db; extern crate db_traits; -extern crate mentat_query; extern crate query_pull_traits; extern crate mentat_query_algebrizer; extern crate mentat_query_sql; @@ -96,7 +96,7 @@ use mentat_core::{ use mentat_db::cache; -use mentat_query::{ +use edn::query::{ NamedPullAttribute, PullAttributeSpec, PullConcreteAttribute, diff --git a/query-sql/Cargo.toml b/query-sql/Cargo.toml index 258f27b8..98e4e15b 100644 --- a/query-sql/Cargo.toml +++ b/query-sql/Cargo.toml @@ -5,6 +5,9 @@ workspace = ".." [dependencies] +[dependencies.edn] +path = "../edn" + [dependencies.core_traits] path = "../core-traits" @@ -14,8 +17,5 @@ path = "../core" [dependencies.mentat_sql] path = "../sql" -[dependencies.mentat_query] -path = "../query" - [dependencies.mentat_query_algebrizer] path = "../query-algebrizer" diff --git a/query-sql/src/lib.rs b/query-sql/src/lib.rs index b068b83e..7cd984b9 100644 --- a/query-sql/src/lib.rs +++ b/query-sql/src/lib.rs @@ -10,7 +10,7 @@ #[macro_use] extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; +extern crate edn; extern crate mentat_query_algebrizer; extern crate mentat_sql; @@ -26,7 +26,7 @@ use mentat_core::{ SQLTypeAffinity, }; -use mentat_query::{ +use edn::query::{ Direction, Limit, Variable, diff --git a/query-translator/Cargo.toml b/query-translator/Cargo.toml index 16bc87c1..7eb9692c 100644 --- a/query-translator/Cargo.toml +++ b/query-translator/Cargo.toml @@ -7,6 +7,9 @@ workspace = ".." failure = "0.1.1" failure_derive = "0.1.1" +[dependencies.edn] +path = "../edn" + [dependencies.mentat_core] path = "../core" @@ -16,9 +19,6 @@ path = "../core-traits" [dependencies.mentat_sql] path = "../sql" -[dependencies.mentat_query] -path = "../query" - [dependencies.mentat_query_algebrizer] path = "../query-algebrizer" diff --git a/query-translator/src/lib.rs b/query-translator/src/lib.rs index 363e5ca7..59a46c36 100644 --- a/query-translator/src/lib.rs +++ b/query-translator/src/lib.rs @@ -10,9 +10,9 @@ extern crate failure; +extern crate edn; extern crate core_traits; extern crate mentat_core; -extern crate mentat_query; extern crate mentat_query_algebrizer; extern crate mentat_query_projector; extern crate mentat_query_sql; diff --git a/query-translator/src/translate.rs b/query-translator/src/translate.rs index 94b03973..bf7ff690 100644 --- a/query-translator/src/translate.rs +++ b/query-translator/src/translate.rs @@ -26,7 +26,7 @@ use mentat_core::util::{ Either, }; -use mentat_query::{ +use edn::query::{ Limit, }; diff --git a/query-translator/tests/translate.rs b/query-translator/tests/translate.rs index 293bed8b..72ae424c 100644 --- a/query-translator/tests/translate.rs +++ b/query-translator/tests/translate.rs @@ -8,9 +8,9 @@ // CONDITIONS OF ANY KIND, either express or implied. See the License for the // specific language governing permissions and limitations under the License. +extern crate edn; extern crate mentat_core; extern crate core_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; extern crate mentat_query_projector; extern crate mentat_query_translator; @@ -20,7 +20,7 @@ use std::collections::BTreeMap; use std::rc::Rc; -use mentat_query::{ +use edn::query::{ FindSpec, Keyword, Variable, diff --git a/query/Cargo.toml b/query/Cargo.toml deleted file mode 100644 index 3dea78f7..00000000 --- a/query/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "mentat_query" -version = "0.0.1" -workspace = ".." - -[dependencies] - -[dependencies.edn] -path = "../edn" - -[dependencies.mentat_core] -path = "../core" diff --git a/query/README.md b/query/README.md deleted file mode 100644 index 2b095991..00000000 --- a/query/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This sub-crate implements the core types used by the query parser, -translator, and executor — variables, find specifications, etc. - -The `edn` sub-crate implements some even lower-level types, such as `Keyword`. diff --git a/query/src/lib.rs b/query/src/lib.rs deleted file mode 100644 index ab117a70..00000000 --- a/query/src/lib.rs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2016 Mozilla -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use -// this file except in compliance with the License. You may obtain a copy of the -// License at http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -extern crate edn; -pub use edn::query::*; diff --git a/src/errors.rs b/src/errors.rs index 43716e8e..92e98c53 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -27,7 +27,6 @@ use mentat_core::{ }; use db_traits::errors::DbError; -use mentat_query; use mentat_query_algebrizer; use mentat_query_projector; use query_pull_traits::errors::{ @@ -80,7 +79,7 @@ pub enum MentatError { UnexpectedLostTransactRace, #[fail(display = "missing core attribute {}", _0)] - MissingCoreVocabulary(mentat_query::Keyword), + MissingCoreVocabulary(edn::query::Keyword), #[fail(display = "schema changed since query was prepared")] PreparedQuerySchemaMismatch, diff --git a/src/lib.rs b/src/lib.rs index 151e277f..60e08d1b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -26,7 +26,6 @@ extern crate mentat_core; extern crate core_traits; extern crate mentat_db; extern crate db_traits; -extern crate mentat_query; extern crate mentat_query_algebrizer; extern crate mentat_query_projector; extern crate mentat_query_pull; @@ -58,7 +57,7 @@ pub use mentat_core::{ Uuid, }; -pub use mentat_query::{ +pub use edn::query::{ FindSpec, }; diff --git a/src/query.rs b/src/query.rs index f2f284c9..fefcec63 100644 --- a/src/query.rs +++ b/src/query.rs @@ -37,13 +37,13 @@ pub use mentat_query_algebrizer::{ QueryInputs, }; -pub use mentat_query::{ +pub use edn::query::{ Keyword, PlainSymbol, Variable, }; -use mentat_query::{ +use edn::query::{ Element, FindSpec, Pattern, diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index d639f899..e445570e 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -43,9 +43,6 @@ default-features = false [dependencies.edn] path = "../../edn" -[dependencies.mentat_query] -path = "../../query" - [dependencies.core_traits] path = "../../core-traits" diff --git a/tools/cli/src/mentat_cli/lib.rs b/tools/cli/src/mentat_cli/lib.rs index ccb9d50a..ac1129a5 100644 --- a/tools/cli/src/mentat_cli/lib.rs +++ b/tools/cli/src/mentat_cli/lib.rs @@ -30,7 +30,6 @@ extern crate time; extern crate mentat; extern crate edn; -extern crate mentat_query; extern crate core_traits; extern crate mentat_db;