From b428579865232be51aebb220a42b97524fb885cf Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Thu, 23 Apr 2020 12:19:41 -0400 Subject: [PATCH] Update dependencies, Rust version 1.44.0-nightly and fix warnings. --- Cargo.toml | 3 ++- db-traits/Cargo.toml | 2 +- db/Cargo.toml | 4 ++-- edn/Cargo.toml | 4 ++-- edn/src/types.rs | 2 +- public-traits/Cargo.toml | 2 +- query-algebrizer/Cargo.toml | 2 +- query-projector-traits/Cargo.toml | 2 +- query-projector/Cargo.toml | 2 +- query-pull/Cargo.toml | 2 +- query-sql/Cargo.toml | 2 +- sql/Cargo.toml | 2 +- src/vocabulary.rs | 30 +++++++++++++++--------------- tests/vocabulary.rs | 4 ++-- tolstoy-traits/Cargo.toml | 2 +- tolstoy/Cargo.toml | 2 +- tools/cli/Cargo.toml | 2 +- transaction/Cargo.toml | 2 +- 18 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b656b4c..6334cb2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ authors = [ "Kit Cambridge ", "Edouard Oger ", "Thom Chiovoloni ", + "Gregory Burd ", ] name = "mentat" version = "0.11.2" @@ -45,7 +46,7 @@ uuid = { version = "0.8", features = ["v4", "serde"] } [dependencies.rusqlite] -version = "0.21.0" +version = "0.22.0" # System sqlite might be very old. features = ["limits"] diff --git a/db-traits/Cargo.toml b/db-traits/Cargo.toml index 3ec99303..6935cbda 100644 --- a/db-traits/Cargo.toml +++ b/db-traits/Cargo.toml @@ -21,5 +21,5 @@ path = "../edn" path = "../core-traits" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] diff --git a/db/Cargo.toml b/db/Cargo.toml index 4dffb3f6..5ff63cc8 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -11,7 +11,7 @@ syncable = ["serde", "serde_json", "serde_derive"] [dependencies] failure = "0.1.6" indexmap = "1.3.1" -itertools = "0.8" +itertools = "0.9" lazy_static = "1.4.0" log = "0.4" ordered-float = "1.0.2" @@ -22,7 +22,7 @@ serde_json = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.edn] diff --git a/edn/Cargo.toml b/edn/Cargo.toml index c8cd57eb..99b6642c 100644 --- a/edn/Cargo.toml +++ b/edn/Cargo.toml @@ -11,10 +11,10 @@ readme = "./README.md" [dependencies] chrono = "0.4" -itertools = "0.8" +itertools = "0.9" num = "0.2" ordered-float = "1.0" -pretty = "0.9" +pretty = "0.10" uuid = { version = "0.8", features = ["v4", "serde"] } serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } diff --git a/edn/src/types.rs b/edn/src/types.rs index 0388cb91..4a54e366 100644 --- a/edn/src/types.rs +++ b/edn/src/types.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. -#![allow(redundant_semicolon)] +#![allow(redundant_semicolons)] use std::cmp::{Ord, Ordering, PartialOrd}; use std::collections::{BTreeMap, BTreeSet, LinkedList}; diff --git a/public-traits/Cargo.toml b/public-traits/Cargo.toml index d0a730d4..266c8f54 100644 --- a/public-traits/Cargo.toml +++ b/public-traits/Cargo.toml @@ -20,7 +20,7 @@ tokio-core = "0.1" uuid = "0.8" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.edn] diff --git a/query-algebrizer/Cargo.toml b/query-algebrizer/Cargo.toml index 98cb41fb..87d80952 100644 --- a/query-algebrizer/Cargo.toml +++ b/query-algebrizer/Cargo.toml @@ -19,4 +19,4 @@ path = "../core-traits" path = "../query-algebrizer-traits" [dev-dependencies] -itertools = "0.8" +itertools = "0.9" diff --git a/query-projector-traits/Cargo.toml b/query-projector-traits/Cargo.toml index 196f0209..9e76df6e 100644 --- a/query-projector-traits/Cargo.toml +++ b/query-projector-traits/Cargo.toml @@ -15,7 +15,7 @@ failure = "0.1" failure_derive = "0.1" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.edn] diff --git a/query-projector/Cargo.toml b/query-projector/Cargo.toml index ec538533..87f875c7 100644 --- a/query-projector/Cargo.toml +++ b/query-projector/Cargo.toml @@ -11,7 +11,7 @@ failure = "0.1" indexmap = "1.3" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.core_traits] diff --git a/query-pull/Cargo.toml b/query-pull/Cargo.toml index b19f0f66..3a97e8ce 100644 --- a/query-pull/Cargo.toml +++ b/query-pull/Cargo.toml @@ -13,7 +13,7 @@ failure = "0.1.1" path = "../query-pull-traits" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.edn] diff --git a/query-sql/Cargo.toml b/query-sql/Cargo.toml index fdce3cff..4dbb73c8 100644 --- a/query-sql/Cargo.toml +++ b/query-sql/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" workspace = ".." [dependencies] -rusqlite = "0.21" +rusqlite = "0.22" [dependencies.edn] path = "../edn" diff --git a/sql/Cargo.toml b/sql/Cargo.toml index 7e09b0fe..afb3cffe 100644 --- a/sql/Cargo.toml +++ b/sql/Cargo.toml @@ -11,7 +11,7 @@ failure = "0.1" ordered-float = "1.0" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.core_traits] diff --git a/src/vocabulary.rs b/src/vocabulary.rs index ee2b863d..71d8a75d 100644 --- a/src/vocabulary.rs +++ b/src/vocabulary.rs @@ -290,21 +290,21 @@ impl Vocabularies { } lazy_static! { - static ref DB_SCHEMA_CORE: Keyword = { kw!(:db.schema/core) }; - static ref DB_SCHEMA_ATTRIBUTE: Keyword = { kw!(:db.schema/attribute) }; - static ref DB_SCHEMA_VERSION: Keyword = { kw!(:db.schema/version) }; - static ref DB_IDENT: Keyword = { kw!(:db/ident) }; - static ref DB_UNIQUE: Keyword = { kw!(:db/unique) }; - static ref DB_UNIQUE_VALUE: Keyword = { kw!(:db.unique/value) }; - static ref DB_UNIQUE_IDENTITY: Keyword = { kw!(:db.unique/identity) }; - static ref DB_IS_COMPONENT: Keyword = { Keyword::namespaced("db", "isComponent") }; - static ref DB_VALUE_TYPE: Keyword = { Keyword::namespaced("db", "valueType") }; - static ref DB_INDEX: Keyword = { kw!(:db/index) }; - static ref DB_FULLTEXT: Keyword = { kw!(:db/fulltext) }; - static ref DB_CARDINALITY: Keyword = { kw!(:db/cardinality) }; - static ref DB_CARDINALITY_ONE: Keyword = { kw!(:db.cardinality/one) }; - static ref DB_CARDINALITY_MANY: Keyword = { kw!(:db.cardinality/many) }; - static ref DB_NO_HISTORY: Keyword = { Keyword::namespaced("db", "noHistory") }; + static ref DB_SCHEMA_CORE: Keyword = kw!(:db.schema/core); + static ref DB_SCHEMA_ATTRIBUTE: Keyword = kw!(:db.schema/attribute); + static ref DB_SCHEMA_VERSION: Keyword = kw!(:db.schema/version); + static ref DB_IDENT: Keyword = kw!(:db/ident); + static ref DB_UNIQUE: Keyword = kw!(:db/unique); + static ref DB_UNIQUE_VALUE: Keyword = kw!(:db.unique/value); + static ref DB_UNIQUE_IDENTITY: Keyword = kw!(:db.unique/identity); + static ref DB_IS_COMPONENT: Keyword = Keyword::namespaced("db", "isComponent"); + static ref DB_VALUE_TYPE: Keyword = Keyword::namespaced("db", "valueType"); + static ref DB_INDEX: Keyword = kw!(:db/index); + static ref DB_FULLTEXT: Keyword = kw!(:db/fulltext); + static ref DB_CARDINALITY: Keyword = kw!(:db/cardinality); + static ref DB_CARDINALITY_ONE: Keyword = kw!(:db.cardinality/one); + static ref DB_CARDINALITY_MANY: Keyword = kw!(:db.cardinality/many); + static ref DB_NO_HISTORY: Keyword = Keyword::namespaced("db", "noHistory"); } trait HasCoreSchema { diff --git a/tests/vocabulary.rs b/tests/vocabulary.rs index f09ac860..8b5c6cd1 100644 --- a/tests/vocabulary.rs +++ b/tests/vocabulary.rs @@ -43,8 +43,8 @@ use mentat::entity_builder::{BuildTerms, TermBuilder}; use mentat::errors::MentatError; lazy_static! { - static ref FOO_NAME: Keyword = { kw!(:foo/name) }; - static ref FOO_MOMENT: Keyword = { kw!(:foo/moment) }; + static ref FOO_NAME: Keyword = kw!(:foo/name); + static ref FOO_MOMENT: Keyword = kw!(:foo/moment); static ref FOO_VOCAB: vocabulary::Definition = { vocabulary::Definition { name: kw!(:org.mozilla/foo), diff --git a/tolstoy-traits/Cargo.toml b/tolstoy-traits/Cargo.toml index b3649651..ac885593 100644 --- a/tolstoy-traits/Cargo.toml +++ b/tolstoy-traits/Cargo.toml @@ -22,5 +22,5 @@ uuid = { version = "0.8" } path = "../db-traits" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml index 3ca55f53..239a105e 100644 --- a/tolstoy/Cargo.toml +++ b/tolstoy/Cargo.toml @@ -51,5 +51,5 @@ path = "../public-traits" path = "../transaction" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index dcef0f8d..3cf6bfe9 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -34,7 +34,7 @@ termion = "1.5" time = "0.2" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"] [dependencies.mentat] diff --git a/transaction/Cargo.toml b/transaction/Cargo.toml index f9ce38a4..403ff00b 100644 --- a/transaction/Cargo.toml +++ b/transaction/Cargo.toml @@ -43,5 +43,5 @@ path = "../query-pull" path = "../query-sql" [dependencies.rusqlite] -version = "0.21" +version = "0.22" features = ["limits"]