From 4ecc0f4fa6ccdddaa22a257bb4e3eaea40892284 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 18:07:35 +0900 Subject: [PATCH] chore: bump rayon from 1.4.1 to 1.5.0 (#14177) * chore: bump rayon from 1.4.1 to 1.5.0 Bumps [rayon](https://github.com/rayon-rs/rayon) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/rayon-rs/rayon/releases) - [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md) - [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.4.1...rayon-core-v1.5.0) Signed-off-by: dependabot[bot] * [auto-commit] Update all Cargo lock files Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot-buildkite --- Cargo.lock | 113 +++++++++++++++++++++++++++++--------- accounts-bench/Cargo.toml | 2 +- banking-bench/Cargo.toml | 2 +- bench-exchange/Cargo.toml | 2 +- bench-tps/Cargo.toml | 2 +- client/Cargo.toml | 2 +- core/Cargo.toml | 2 +- dos/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- perf/Cargo.toml | 2 +- poh-bench/Cargo.toml | 2 +- programs/bpf/Cargo.lock | 101 +++++++++++++++++++++++++++------- runtime/Cargo.toml | 2 +- 13 files changed, 179 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0a5fa167..1bc436488 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -631,6 +631,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -693,21 +699,42 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.1", +] + [[package]] name = "crossbeam-deque" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.1", + "crossbeam-utils 0.8.1", +] + [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -716,10 +743,24 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.0", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.4", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.1", + "lazy_static", + "memoffset 0.6.1", "scopeguard", ] @@ -730,7 +771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -745,6 +786,17 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +dependencies = [ + "autocfg 1.0.0", + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -2150,6 +2202,15 @@ dependencies = [ "autocfg 1.0.0", ] +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg 1.0.0", +] + [[package]] name = "mime" version = "0.2.6" @@ -3056,25 +3117,25 @@ dependencies = [ [[package]] name = "rayon" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg 1.0.0", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-channel 0.5.0", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.1", "lazy_static", "num_cpus", ] @@ -3236,7 +3297,7 @@ dependencies = [ "base64 0.11.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -3655,7 +3716,7 @@ name = "solana-accounts-bench" version = "1.6.0" dependencies = [ "clap", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "log 0.4.11", "rand 0.7.3", "rayon", @@ -3671,7 +3732,7 @@ name = "solana-banking-bench" version = "1.6.0" dependencies = [ "clap", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "log 0.4.11", "rand 0.7.3", "rayon", @@ -4000,7 +4061,7 @@ dependencies = [ "bytes 0.4.12", "chrono", "core_affinity", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "ed25519-dalek", "flate2", "fs_extra", @@ -4329,7 +4390,7 @@ dependencies = [ "byteorder", "chrono", "chrono-humanize", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "dlopen", "dlopen_derive", "ed25519-dalek", @@ -4415,7 +4476,7 @@ name = "solana-local-cluster" version = "1.6.0" dependencies = [ "assert_matches", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "fs_extra", "gag", "itertools 0.9.0", @@ -4745,7 +4806,7 @@ dependencies = [ "bv", "byteorder", "bzip2", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "dashmap", "dir-diff", "flate2", @@ -5728,7 +5789,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", ] @@ -5782,7 +5843,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", "log 0.4.11", @@ -5851,9 +5912,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", "log 0.4.11", @@ -5868,7 +5929,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "slab", "tokio-executor", diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml index e9910bb30..6cf4669fd 100644 --- a/accounts-bench/Cargo.toml +++ b/accounts-bench/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] log = "0.4.11" -rayon = "1.4.0" +rayon = "1.5.0" solana-logger = { path = "../logger", version = "1.6.0" } solana-runtime = { path = "../runtime", version = "1.6.0" } solana-measure = { path = "../measure", version = "1.6.0" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index 9eafbfe9e..6fb65bb0e 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -13,7 +13,7 @@ clap = "2.33.1" crossbeam-channel = "0.4" log = "0.4.11" rand = "0.7.0" -rayon = "1.4.0" +rayon = "1.5.0" solana-core = { path = "../core", version = "1.6.0" } solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-streamer = { path = "../streamer", version = "1.6.0" } diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index 118aa5bf0..9895d5264 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.11" num-derive = "0.3" num-traits = "0.2" rand = "0.7.0" -rayon = "1.4.0" +rayon = "1.5.0" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index d8ed37828..e18656b0e 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -12,7 +12,7 @@ publish = false bincode = "1.3.1" clap = "2.33.1" log = "0.4.11" -rayon = "1.4.0" +rayon = "1.5.0" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 1d3f4c5a6..abe267574 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -17,7 +17,7 @@ indicatif = "0.15.0" jsonrpc-core = "15.0.0" log = "0.4.11" net2 = "0.2.37" -rayon = "1.4.0" +rayon = "1.5.0" reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "0.11.0" serde = "1.0.112" diff --git a/core/Cargo.toml b/core/Cargo.toml index 533cac25d..0611159fa 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -42,7 +42,7 @@ num-traits = "0.2" rand = "0.7.0" rand_chacha = "0.2.2" raptorq = "1.4.2" -rayon = "1.4.1" +rayon = "1.5.0" regex = "1.3.9" rustversion = "1.0.4" serde = "1.0.112" diff --git a/dos/Cargo.toml b/dos/Cargo.toml index bf5256637..d753e657d 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" clap = "2.33.1" log = "0.4.11" rand = "0.7.0" -rayon = "1.4.1" +rayon = "1.5.0" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-core = { path = "../core", version = "1.6.0" } solana-ledger = { path = "../ledger", version = "1.6.0" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 4a06d1db7..198db094f 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -28,7 +28,7 @@ num_cpus = "1.13.0" prost = "0.6.1" rand = "0.7.0" rand_chacha = "0.2.2" -rayon = "1.4.1" +rayon = "1.5.0" reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } serde = "1.0.112" serde_bytes = "0.11.4" diff --git a/perf/Cargo.toml b/perf/Cargo.toml index 7e4ef2d24..d404456e6 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" rand = "0.7.0" dlopen = "0.1.8" bincode = "1.3.1" -rayon = "1.4.0" +rayon = "1.5.0" serde = "1.0.112" dlopen_derive = "0.1.4" lazy_static = "1.4.0" diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml index ddc2741f4..b592af00d 100644 --- a/poh-bench/Cargo.toml +++ b/poh-bench/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" clap = "2.33.1" log = "0.4.11" rand = "0.7.0" -rayon = "1.4.0" +rayon = "1.5.0" solana-logger = { path = "../logger", version = "1.6.0" } solana-ledger = { path = "../ledger", version = "1.6.0" } solana-sdk = { path = "../sdk", version = "1.6.0" } diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 344020d31..6440d61aa 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -328,6 +328,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -349,21 +355,42 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.1", +] + [[package]] name = "crossbeam-deque" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.1", + "crossbeam-utils 0.8.1", +] + [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -372,10 +399,24 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.4", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.1", + "lazy_static", + "memoffset 0.6.1", "scopeguard", ] @@ -386,7 +427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -401,6 +442,17 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -1111,6 +1163,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -1518,25 +1579,25 @@ dependencies = [ [[package]] name = "rayon" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-channel 0.5.0", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.1", "lazy_static", "num_cpus", ] @@ -2271,7 +2332,7 @@ dependencies = [ "bv", "byteorder 1.3.4", "bzip2", - "crossbeam-channel", + "crossbeam-channel 0.4.4", "dashmap", "dir-diff", "flate2", @@ -2641,7 +2702,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures", ] @@ -2673,7 +2734,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures", "lazy_static", "log", @@ -2728,9 +2789,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures", "lazy_static", "log", @@ -2745,7 +2806,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures", "slab", "tokio-executor", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 117663a14..15b58f5d6 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -31,7 +31,7 @@ num-traits = { version = "0.2" } num_cpus = "1.13.0" ouroboros = "0.5.1" rand = "0.7.0" -rayon = "1.4.1" +rayon = "1.5.0" regex = "1.3.9" serde = { version = "1.0.112", features = ["rc"] } serde_derive = "1.0.103"