Pre: Remove query/ crate

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"
 

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"

query-algebrizer/src/clauses/convert.rs

@@ -20,7 +20,7 @@ use mentat_core::{
     ValueTypeSet,
 };
 
-use mentat_query::{
+use edn::query::{
     FnArg,
     NonIntegerConstant,
     Variable,

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,

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,

query-algebrizer/src/clauses/inputs.rs

@@ -15,7 +15,7 @@ use core_traits::{
     TypedValue,
 };
 
-use mentat_query::{
+use edn::query::{
     Variable,
 };
 

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,
 };
 

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

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,
     };

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,
     };

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,

query-algebrizer/src/clauses/resolve.rs

@@ -18,7 +18,7 @@ use mentat_core::{
     Schema,
 };
 
-use mentat_query::{
+use edn::query::{
     FnArg,
     NonIntegerConstant,
     PlainSymbol,

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,

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,
 };
 

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,
 };
 

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,

query-algebrizer/src/types.rs

@@ -25,7 +25,7 @@ use mentat_core::{
     ValueTypeSet,
 };
 
-use mentat_query::{
+use edn::query::{
     Direction,
     FindSpec,
     Keyword,

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,

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,
 };
 

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,

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,

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;

query-algebrizer/tests/utils/mod.rs

@@ -23,7 +23,7 @@ use mentat_core::{
     Schema,
 };
 
-use mentat_query::{
+use edn::query::{
     Keyword,
 };
 

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"
 

query-projector/src/aggregates.rs

@@ -16,7 +16,7 @@ use mentat_core::{
     ValueTypeSet,
 };
 
-use mentat_query::{
+use edn::query::{
     Aggregate,
     QueryFunction,
     Variable,

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::{

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,

query-projector/src/project.rs

@@ -26,7 +26,7 @@ use mentat_core::util::{
     Either,
 };
 
-use mentat_query::{
+use edn::query::{
     Element,
     Pull,
     Variable,

query-projector/src/pull.rs

@@ -25,7 +25,7 @@ use mentat_core::{
     ValueRc,
 };
 
-use mentat_query::{
+use edn::query::{
     PullAttributeSpec,
 };
 

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,
 };
 

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"
 

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,

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"

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,

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"
 

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;

query-translator/src/translate.rs

@@ -26,7 +26,7 @@ use mentat_core::util::{
     Either,
 };
 
-use mentat_query::{
+use edn::query::{
     Limit,
 };
 

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,

query/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "mentat_query"
-version = "0.0.1"
-workspace = ".."
-
-[dependencies]
-
-[dependencies.edn]
-path = "../edn"
-
-[dependencies.mentat_core]
-path = "../core"

query/README.md

@@ -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`.

query/src/lib.rs

@@ -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::*;

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,

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,
 };
 

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,

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"
 

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;