diff --git a/Cargo.lock b/Cargo.lock index ad6113f..2e616c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,32 +229,36 @@ dependencies = [ "atty", "bitflags 1.3.2", "strsim", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.2.25" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "textwrap 0.16.0", + "clap_builder", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ - "os_str_bytes", + "anstyle", + "clap_lex", ] +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -281,19 +285,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", + "clap 4.5.7", "criterion-plot", + "is-terminal", "itertools 0.10.5", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -657,6 +661,17 @@ dependencies = [ "hashbrown 0.14.3", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.4", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -692,7 +707,7 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.4.4" +version = "0.4.4-patch.1" dependencies = [ "criterion", "lair_keystore_api", @@ -708,7 +723,7 @@ dependencies = [ [[package]] name = "lair_keystore_api" -version = "0.4.4" +version = "0.4.4-patch.1" dependencies = [ "assert_cmd", "base64 0.13.1", @@ -822,11 +837,11 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.10.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", ] [[package]] @@ -988,12 +1003,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -1556,9 +1565,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -1760,12 +1769,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thread_local" version = "1.1.7" @@ -1849,9 +1852,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -1861,18 +1864,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.1.0", "serde", @@ -2310,9 +2313,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 9f655ea..a541fa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,15 +9,15 @@ members = [ [workspace.dependencies] assert_cmd = "2.0.11" base64 = "0.13.1" -criterion = "0.4.0" +criterion = "0.5.1" dunce = "1.0.4" futures = "0.3.28" # this doesn't strictly need to be pinned, but it supports the # determinism of the strict client/server version checks hc_seed_bundle = { version = "=0.2.3", path = "./crates/hc_seed_bundle" } # lair_keystore_api must be pinned to enable strict version checks -lair_keystore_api = { version = "=0.4.4", path = "./crates/lair_keystore_api" } -lru = "0.10.0" +lair_keystore_api = { version = "=0.4.4-patch.1", path = "./crates/lair_keystore_api" } +lru = "0.12.3" nanoid = "0.4.0" one_err = "0.0.8" once_cell = "1.17.1" @@ -25,7 +25,7 @@ parking_lot = "0.12.1" pretty_assertions = "1.3.0" rcgen = { version = "0.10.0", features = [ "zeroize" ] } rmp-serde = "0.15" -rmpv = { version = "=1.0.0", features = [ "with-serde" ] } # Version 1.0.1 requires Rust 1.70.0 +rmpv = { version = "1", features = [ "with-serde" ] } rpassword = "7.2.0" rusqlite = { version = "0.29", features = [ "modern_sqlite" ] } serde = { version = "1", features = [ "derive", "rc" ] } @@ -37,9 +37,9 @@ sqlformat = "0.2.1" structopt = "0.3.26" sysinfo = "0.28.4" tempdir = "0.3.7" -time = "=0.3.23" # Pinned to prevent rvgen pulling in ^0.2.25 which doesn't build on Rust 1.66.1 +time = "0.3.23" tokio = { version = "1.35.1" } -toml = "0.7.3" +toml = "0.8.14" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = [ "env-filter" ] } url = { version = "2.3.1", features = [ "serde" ] } diff --git a/crates/lair_keystore/Cargo.toml b/crates/lair_keystore/Cargo.toml index 20ccb9e..9a33f18 100644 --- a/crates/lair_keystore/Cargo.toml +++ b/crates/lair_keystore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lair_keystore" -version = "0.4.4" +version = "0.4.4-patch.1" description = "secret lair private keystore" license = "MIT OR Apache-2.0" repository = "https://github.com/holochain/lair" diff --git a/crates/lair_keystore_api/Cargo.toml b/crates/lair_keystore_api/Cargo.toml index dd13d02..8d9a4cc 100644 --- a/crates/lair_keystore_api/Cargo.toml +++ b/crates/lair_keystore_api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lair_keystore_api" -version = "0.4.4" +version = "0.4.4-patch.1" description = "secret lair private keystore API library" license = "MIT OR Apache-2.0" repository = "https://github.com/holochain/lair"