From 526c9c39288861c8173322dec7b76c4cf6668af5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:29:49 +0000 Subject: [PATCH 1/2] Update rusqlite requirement from ~0.23 to ~0.24 Updates the requirements on [rusqlite](https://github.com/rusqlite/rusqlite) to permit the latest version. - [Release notes](https://github.com/rusqlite/rusqlite/releases) - [Changelog](https://github.com/rusqlite/rusqlite/blob/master/Changelog.md) - [Commits](https://github.com/rusqlite/rusqlite/compare/0.23.0...0.23.1) Signed-off-by: dependabot-preview[bot] --- Cargo.toml | 2 +- tools/cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index acce4614..d5289d3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ log = "~0.4" uuid = { version = "~0.8", features = ["v4", "serde"] } [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index 76445a7d..e6a24e3d 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.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.mentat] From 324929a02af07d701c6bef1b489b21c8bb708656 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Mon, 24 Aug 2020 16:41:17 -0400 Subject: [PATCH 2/2] Update all uses of rusqlite to 0.24 --- db-traits/Cargo.toml | 2 +- db/Cargo.toml | 2 +- public-traits/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/store.rs | 4 ++-- tolstoy-traits/Cargo.toml | 2 +- tolstoy/Cargo.toml | 2 +- transaction/Cargo.toml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db-traits/Cargo.toml b/db-traits/Cargo.toml index 894b2ab9..1424f101 100644 --- a/db-traits/Cargo.toml +++ b/db-traits/Cargo.toml @@ -21,5 +21,5 @@ path = "../edn" path = "../core-traits" [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] diff --git a/db/Cargo.toml b/db/Cargo.toml index bd0a9759..2197c0a9 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -22,7 +22,7 @@ serde_json = { version = "~1.0", optional = true } serde_derive = { version = "~1.0", optional = true } [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/public-traits/Cargo.toml b/public-traits/Cargo.toml index d4896b8f..b10db060 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.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.hyper] diff --git a/query-projector-traits/Cargo.toml b/query-projector-traits/Cargo.toml index 24cfc97a..89f631b2 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.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/query-projector/Cargo.toml b/query-projector/Cargo.toml index 88ea89c1..b8601157 100644 --- a/query-projector/Cargo.toml +++ b/query-projector/Cargo.toml @@ -11,7 +11,7 @@ failure = "~0.1" indexmap = "~1.5" [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.core_traits] diff --git a/query-pull/Cargo.toml b/query-pull/Cargo.toml index 23913588..2f96a10b 100644 --- a/query-pull/Cargo.toml +++ b/query-pull/Cargo.toml @@ -13,7 +13,7 @@ failure = "~0.1" path = "../query-pull-traits" [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/query-sql/Cargo.toml b/query-sql/Cargo.toml index 05c27092..0a8e743a 100644 --- a/query-sql/Cargo.toml +++ b/query-sql/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.2" workspace = ".." [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/sql/Cargo.toml b/sql/Cargo.toml index 087fca01..6f0685a3 100644 --- a/sql/Cargo.toml +++ b/sql/Cargo.toml @@ -11,7 +11,7 @@ failure = "~0.1" ordered-float = "~2.0" [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.core_traits] diff --git a/src/store.rs b/src/store.rs index b09b0cde..97f075a2 100644 --- a/src/store.rs +++ b/src/store.rs @@ -721,7 +721,7 @@ mod tests { o.txids.push(*tx_id); o.changes.push(changes.clone()); } - o.txids.sort(); + o.txids.sort_unstable(); } thread_tx.lock().unwrap().send(()).unwrap(); })); @@ -827,7 +827,7 @@ mod tests { o.txids.push(*tx_id); o.changes.push(changes.clone()); } - o.txids.sort(); + o.txids.sort_unstable(); } thread_tx.lock().unwrap().send(()).unwrap(); })); diff --git a/tolstoy-traits/Cargo.toml b/tolstoy-traits/Cargo.toml index 13454f0c..2a331e9a 100644 --- a/tolstoy-traits/Cargo.toml +++ b/tolstoy-traits/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "~1.0" uuid = { version = "~0.8" } [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.db_traits] diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml index d09d9194..6ec91177 100644 --- a/tolstoy/Cargo.toml +++ b/tolstoy/Cargo.toml @@ -26,7 +26,7 @@ lazy_static = "~1.4" uuid = { version = "~0.8", features = ["v4", "serde"] } [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn] diff --git a/transaction/Cargo.toml b/transaction/Cargo.toml index 86e0bfdc..c8661cc9 100644 --- a/transaction/Cargo.toml +++ b/transaction/Cargo.toml @@ -10,7 +10,7 @@ sqlcipher = ["rusqlite/sqlcipher"] failure = "~0.1" [dependencies.rusqlite] -version = "~0.23" +version = "~0.24" features = ["limits", "bundled"] [dependencies.edn]