From 0d23ad00b1e8360d52c27d9acdc2e240379d920c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 04:53:39 +0000 Subject: [PATCH] Update to rayon 1.4.0 (#11898) (#11902) (cherry picked from commit c4253dc0f9630dc663d5733672d47837e0aa074b) Co-authored-by: sakridge --- Cargo.lock | 10 +++++----- 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 | 10 +++++----- runtime/Cargo.toml | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de91d0e5d4..2a04976660 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2636,9 +2636,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" dependencies = [ "autocfg 1.0.0", "crossbeam-deque", @@ -2648,12 +2648,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml index 6d40ac6915..4eaa85769d 100644 --- a/accounts-bench/Cargo.toml +++ b/accounts-bench/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://solana.com/" [dependencies] log = "0.4.6" -rayon = "1.3.1" +rayon = "1.4.0" solana-logger = { path = "../logger", version = "1.3.8" } solana-runtime = { path = "../runtime", version = "1.3.8" } solana-measure = { path = "../measure", version = "1.3.8" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index e567f712dc..254f6ef364 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -12,7 +12,7 @@ clap = "2.33.1" crossbeam-channel = "0.4" log = "0.4.6" rand = "0.7.0" -rayon = "1.3.1" +rayon = "1.4.0" solana-core = { path = "../core", version = "1.3.8" } solana-clap-utils = { path = "../clap-utils", version = "1.3.8" } solana-streamer = { path = "../streamer", version = "1.3.8" } diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index 15eccc6c37..90ae7ca06c 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.8" num-derive = "0.3" num-traits = "0.2" rand = "0.7.0" -rayon = "1.3.1" +rayon = "1.4.0" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.3.8" } diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index e3687026d1..180f878564 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" bincode = "1.3.1" clap = "2.33.1" log = "0.4.8" -rayon = "1.3.1" +rayon = "1.4.0" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.3.8" } diff --git a/client/Cargo.toml b/client/Cargo.toml index ffae2c7415..8d7893a3aa 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,7 +14,7 @@ bs58 = "0.3.1" indicatif = "0.15.0" jsonrpc-core = "14.2.0" log = "0.4.8" -rayon = "1.3.1" +rayon = "1.4.0" reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = "1.0.112" serde_derive = "1.0.103" diff --git a/core/Cargo.toml b/core/Cargo.toml index 20dfa97fae..0aad37305a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -38,7 +38,7 @@ num-traits = "0.2" rand = "0.7.0" rand_chacha = "0.2.2" raptorq = "1.4.2" -rayon = "1.3.1" +rayon = "1.4.0" regex = "1.3.9" serde = "1.0.112" serde_derive = "1.0.103" diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 79bc5970fb..14d18c3c15 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -12,7 +12,7 @@ bincode = "1.3.1" clap = "2.33.1" log = "0.4.8" rand = "0.7.0" -rayon = "1.3.1" +rayon = "1.4.0" solana-clap-utils = { path = "../clap-utils", version = "1.3.8" } solana-core = { path = "../core", version = "1.3.8" } solana-ledger = { path = "../ledger", version = "1.3.8" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 7d0620495d..4aa2684120 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -24,7 +24,7 @@ log = { version = "0.4.8" } num_cpus = "1.13.0" rand = "0.7.0" rand_chacha = "0.2.2" -rayon = "1.3.1" +rayon = "1.4.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 c8965834cc..e28b7c76ca 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.3.1" +rayon = "1.4.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 8db3e99cf5..d78a0e65c2 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.6" rand = "0.7.0" -rayon = "1.3.0" +rayon = "1.4.0" solana-logger = { path = "../logger", version = "1.3.8" } solana-ledger = { path = "../ledger", version = "1.3.8" } solana-sdk = { path = "../sdk", version = "1.3.8" } diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index f1d1a9930d..1f286f5336 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1307,9 +1307,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" dependencies = [ "autocfg", "crossbeam-deque", @@ -1319,12 +1319,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 32667c64f0..b4ef637af8 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -28,7 +28,7 @@ num-derive = { version = "0.3" } num-traits = { version = "0.2" } num_cpus = "1.13.0" rand = "0.7.0" -rayon = "1.3.1" +rayon = "1.4.0" regex = "1.3.9" serde = { version = "1.0.112", features = ["rc"] } serde_derive = "1.0.103"