From c68d3ea3f44bbb2c0d7e49b82cf6b1ca951b9156 Mon Sep 17 00:00:00 2001 From: Sayan Nandan Date: Wed, 5 Jan 2022 21:03:06 -0800 Subject: [PATCH] Upgrade deps All deps except for `clap` has been upgraded. Due to the removal of the `args` field in `ArgMatches` in v3, and our dependence on the field, we cannot upgrade to the latest version. A PR has been created and once it is merged or a workaround suggested, we can upgrade. (see clap-rs/clap#3265) --- Cargo.lock | 69 ++++++++++++++++++++-------------------- cli/Cargo.toml | 2 +- libstress/Cargo.toml | 2 +- server/Cargo.toml | 4 +-- server/src/config/mod.rs | 2 +- sky-bench/Cargo.toml | 4 +-- sky-macros/Cargo.toml | 6 ++-- stress-test/Cargo.toml | 4 +-- 8 files changed, 46 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 948e7666..f0ec3d82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8340083d28acb43451166543b98c838299b7e0863621be53a338adceea0ed" +checksum = "1951fb8aa063a2ee18b4b4d217e4aa2ec9cc4f2430482983f607fa10cd36d7aa" dependencies = [ "error-code", "str-buf", @@ -292,23 +292,22 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ - "autocfg", "futures-core", "futures-task", "pin-project-lite", @@ -523,9 +522,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -601,9 +600,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -619,24 +618,24 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro2" -version = "1.0.34" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ "proc-macro2", ] @@ -754,9 +753,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rustyline" -version = "9.1.1" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c38cfbd0a4d7df7aab7cf53732d5d43449d0300358fd15cd4e8c8468a956aca" +checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" dependencies = [ "bitflags", "cfg-if", @@ -790,18 +789,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -810,9 +809,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa", "ryu", @@ -821,9 +820,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35dfd12afb7828318348b8c408383cf5071a086c1d4ab1c0f9840ec92dbb922" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" dependencies = [ "libc", "signal-hook-registry", @@ -977,9 +976,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" dependencies = [ "proc-macro2", "quote", @@ -988,9 +987,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8591205e26661d45f9b31300599b133328c7e0f57e552a7be8d3b3c5748470" +checksum = "ccb37aa4af23791c584202d286ed9420e023e9d27e49d5a76215623f4bcc2502" dependencies = [ "cfg-if", "core-foundation-sys", @@ -1119,9 +1118,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 31686ddd..aa50710d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -16,5 +16,5 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next", f # external deps tokio = { version = "1.15.0", features = ["full"] } clap = { version = "2.34.0", features = ["yaml"] } -rustyline = "9.1.1" +rustyline = "9.1.2" crossterm = "0.22.1" diff --git a/libstress/Cargo.toml b/libstress/Cargo.toml index a944a314..be5a674f 100644 --- a/libstress/Cargo.toml +++ b/libstress/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] # external deps -num_cpus = "1.13.0" +num_cpus = "1.13.1" crossbeam-channel = "0.5.1" rayon = "1.5.1" log = "0.4.14" diff --git a/server/Cargo.toml b/server/Cargo.toml index 890c0c0a..26d8531d 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -18,11 +18,11 @@ clap = { version = "2.34.0", features = ["yaml"] } env_logger = "0.9.0" hashbrown = { version = "0.11.2", features = ["raw"] } log = "0.4.14" -num_cpus = "1.13.0" +num_cpus = "1.13.1" openssl = { version = "0.10.38", features = ["vendored"] } parking_lot = "0.11.2" regex = "1.5.4" -serde = { version = "1.0.132", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } tokio = { version = "1.15.0", features = ["full"] } tokio-openssl = "0.6.3" toml = "0.5.8" diff --git a/server/src/config/mod.rs b/server/src/config/mod.rs index e250152f..8d89363d 100644 --- a/server/src/config/mod.rs +++ b/server/src/config/mod.rs @@ -343,7 +343,7 @@ pub fn get_config_file_or_return_cfg() -> Result { fn get_config_file_or_return_cfg_from_matches( matches: ArgMatches, ) -> Result { - let no_cli_args = matches.args.is_empty(); // check env args + let no_cli_args = matches.args.is_empty(); // check cli args let env_args = cfgenv::get_env_config()?; if no_cli_args && env_args.is_none() { // that means we need to use the default config diff --git a/sky-bench/Cargo.toml b/sky-bench/Cargo.toml index d1c14156..31cd249e 100644 --- a/sky-bench/Cargo.toml +++ b/sky-bench/Cargo.toml @@ -14,5 +14,5 @@ skytable = { git = "https://github.com/skytable/client-rust", branch = "next" } clap = { version = "2.34.0", features = ["yaml"] } devtimer = "4.0.1" rand = "0.8.4" -serde = { version = "1.0.132", features = ["derive"] } -serde_json = "1.0.73" +serde = { version = "1.0.133", features = ["derive"] } +serde_json = "1.0.74" diff --git a/sky-macros/Cargo.toml b/sky-macros/Cargo.toml index 0b7126b4..ebe7e4d2 100644 --- a/sky-macros/Cargo.toml +++ b/sky-macros/Cargo.toml @@ -11,7 +11,7 @@ proc-macro = true [dependencies] # external deps -proc-macro2 = "1.0.34" -quote = "1.0.10" +proc-macro2 = "1.0.36" +quote = "1.0.14" rand = "0.8.4" -syn = { version = "1.0.82", features = ["full"] } +syn = { version = "1.0.84", features = ["full"] } diff --git a/stress-test/Cargo.toml b/stress-test/Cargo.toml index 024fca75..13f0938a 100644 --- a/stress-test/Cargo.toml +++ b/stress-test/Cargo.toml @@ -12,11 +12,11 @@ libstress = { path = "../libstress" } skytable = { git = "https://github.com/skytable/client-rust.git", branch = "next", features = [ "dbg", ] } -sysinfo = "0.22.2" +sysinfo = "0.22.4" devtimer = "4.0.1" # external deps env_logger = "0.9.0" log = "0.4.14" rand = "0.8.4" crossbeam-channel = "0.5.1" -num_cpus = "1.13.0" +num_cpus = "1.13.1"