Merge pull request #216 from andrewwhitehead/update/sqlx

Update sqlx to 0.7.3

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = ["askar-crypto", "askar-storage"]
+resolver = "2"
 
 [package]
 name = "aries-askar"
@@ -28,9 +29,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 [features]
 default = ["all_backends", "ffi", "logger", "migration"]
 all_backends = ["postgres", "sqlite"]
-ffi = ["ffi-support", "logger"]
-jemalloc = ["jemallocator"]
-logger = ["env_logger", "log", "askar-storage/log"]
+ffi = ["dep:ffi-support", "logger"]
+jemalloc = ["dep:jemallocator"]
+logger = ["dep:env_logger", "dep:log", "askar-storage/log"]
 postgres = ["askar-storage/postgres"]
 sqlite = ["askar-storage/sqlite"]
 pg_test = ["askar-storage/pg_test"]
@@ -59,14 +60,15 @@ path = "./askar-storage"
 default-features = false
 features = ["any"]
 
+[dev-dependencies]
+criterion = { version = "0.5", features = ["html_reports"] }
+rand = { version = "0.8" }
+
 [profile.release]
 codegen-units = 1
 lto = true
 panic = "abort"
-
-[dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
-rand = { version = "0.8" }
+strip = "debuginfo"
 
 [[bench]]
 name = "benchmark"

askar-storage/Cargo.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 repository = "https://github.com/hyperledger/aries-askar/"
 categories = ["cryptography", "database"]
 keywords = ["hyperledger", "aries", "ssi", "verifiable", "credentials"]
-rust-version = "1.58"
+rust-version = "1.63"
 
 [package.metadata.docs.rs]
 features = ["all_backends"]
@@ -20,9 +20,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 default = ["all_backends", "log"]
 all_backends = ["any", "postgres", "sqlite"]
 any = []
-migration = ["rmp-serde", "sqlx/macros"]
-postgres = ["sqlx", "sqlx/postgres", "sqlx/tls-rustls"]
-sqlite = ["sqlx", "sqlx/sqlite"]
+migration = ["dep:rmp-serde", "dep:sqlx", "sqlx?/macros"]
+postgres = ["dep:sqlx", "sqlx?/postgres", "sqlx?/tls-rustls"]
+sqlite = ["dep:sqlx", "sqlx?/sqlite"]
 pg_test = ["postgres"]
 
 [dependencies]
@@ -35,7 +35,7 @@ digest = "0.10"
 futures-lite = "2.0"
 hex = "0.4"
 hmac = "0.12"
-itertools = "0.11"
+itertools = "0.12"
 log = { version = "0.4", optional = true }
 once_cell = "1.5"
 percent-encoding = "2.0"
@@ -56,7 +56,7 @@ default-features = false
 features = ["alloc", "argon2", "chacha", "std_rng"]
 
 [dependencies.sqlx]
-version = "0.7.1"
+version = "0.7.3"
 default-features = false
 features = ["chrono", "runtime-tokio"]
 optional = true

src/lib.rs

@@ -7,7 +7,7 @@
 mod error;
 pub use self::error::{Error, ErrorKind};
 
-#[cfg(any(test, feature = "log"))]
+#[cfg(any(test, feature = "logger"))]
 #[macro_use]
 extern crate log;