Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rayon and rustc-rayon #92740

Merged
merged 1 commit into from
Jan 16, 2022
+53 −88
Merged

Update rayon and rustc-rayon #92740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 31 additions & 63 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
@@ -285,7 +285,7 @@ dependencies = [
"cargo-util",
"clap",
"crates-io",
"crossbeam-utils 0.8.3",
"crossbeam-utils",
"curl",
"curl-sys",
"env_logger 0.9.0",
@@ -787,69 +787,44 @@ dependencies = [

[[package]]
name = "crossbeam-channel"
version = "0.5.0"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils 0.8.3",
"crossbeam-utils",
]

[[package]]
name = "crossbeam-deque"
version = "0.7.4"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
"crossbeam-utils 0.7.2",
"maybe-uninit",
"crossbeam-utils",
]

[[package]]
name = "crossbeam-epoch"
version = "0.8.2"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
dependencies = [
"autocfg",
"cfg-if 0.1.10",
"crossbeam-utils 0.7.2",
"cfg-if 1.0.0",
"crossbeam-utils",
"lazy_static",
"maybe-uninit",
"memoffset",
"scopeguard",
]

[[package]]
name = "crossbeam-queue"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
"cfg-if 0.1.10",
"crossbeam-utils 0.7.2",
"maybe-uninit",
]

[[package]]
name = "crossbeam-utils"
version = "0.7.2"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
dependencies = [
"autocfg",
"cfg-if 0.1.10",
"lazy_static",
]

[[package]]
name = "crossbeam-utils"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"lazy_static",
]
@@ -1665,7 +1640,7 @@ version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
dependencies = [
"crossbeam-utils 0.8.3",
"crossbeam-utils",
"globset",
"lazy_static",
"log",
@@ -2135,12 +2110,6 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"

[[package]]
name = "maybe-uninit"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"

[[package]]
name = "md-5"
version = "0.9.1"
@@ -2229,9 +2198,9 @@ dependencies = [

[[package]]
name = "memoffset"
version = "0.5.5"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
"autocfg",
]
@@ -3005,9 +2974,9 @@ dependencies = [

[[package]]
name = "rayon"
version = "1.3.1"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
dependencies = [
"autocfg",
"crossbeam-deque",
@@ -3017,13 +2986,13 @@ dependencies = [

[[package]]
name = "rayon-core"
version = "1.7.1"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-queue",
"crossbeam-utils 0.7.2",
"crossbeam-utils",
"lazy_static",
"num_cpus",
]
@@ -3276,7 +3245,7 @@ dependencies = [
"arrayvec",
"bitflags",
"cfg-if 0.1.10",
"crossbeam-utils 0.8.3",
"crossbeam-utils",
"ena",
"indexmap",
"jobserver",
@@ -3503,9 +3472,9 @@ dependencies = [

[[package]]
name = "rustc-rayon"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed7d6a39f8bfd4421ce720918234d1e672b83824c91345b47c93746839cf1629"
checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246"
dependencies = [
"crossbeam-deque",
"either",
@@ -3514,13 +3483,12 @@ dependencies = [

[[package]]
name = "rustc-rayon-core"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94187d9ea3e8c38fafdbc38acb94eafa7ce155867f6ccb13830466a0d0db8c6"
checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500"
dependencies = [
"crossbeam-deque",
"crossbeam-queue",
"crossbeam-utils 0.7.2",
"crossbeam-utils",
"lazy_static",
"num_cpus",
]
@@ -3558,7 +3526,7 @@ version = "1.0.0"
dependencies = [
"bstr",
"byteorder",
"crossbeam-utils 0.8.3",
"crossbeam-utils",
"libc",
"libz-sys",
"proc-macro2",
@@ -5324,7 +5292,7 @@ name = "tidy"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.12.0",
"crossbeam-utils 0.8.3",
"crossbeam-utils",
"lazy_static",
"regex",
"walkdir",
4 changes: 2 additions & 2 deletions compiler/rustc_data_structures/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ rustc_macros = { path = "../rustc_macros" }
rustc_graphviz = { path = "../rustc_graphviz" }
cfg-if = "0.1.2"
stable_deref_trait = "1.0.0"
rayon = { version = "0.3.1", package = "rustc-rayon" }
rayon-core = { version = "0.3.1", package = "rustc-rayon-core" }
rayon = { version = "0.3.2", package = "rustc-rayon" }
rayon-core = { version = "0.3.2", package = "rustc-rayon-core" }
rustc-hash = "1.1.0"
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
rustc_index = { path = "../rustc_index", package = "rustc_index" }
4 changes: 2 additions & 2 deletions compiler/rustc_interface/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ doctest = false
libc = "0.2"
libloading = "0.7.1"
tracing = "0.1"
rustc-rayon-core = "0.3.1"
rayon = { version = "0.3.1", package = "rustc-rayon" }
rustc-rayon-core = "0.3.2"
rayon = { version = "0.3.2", package = "rustc-rayon" }
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" }
4 changes: 2 additions & 2 deletions compiler/rustc_middle/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ bitflags = "1.2.1"
either = "1.5.0"
gsgdt = "0.1.2"
tracing = "0.1"
rustc-rayon = "0.3.1"
rustc-rayon-core = "0.3.1"
rustc-rayon = "0.3.2"
rustc-rayon-core = "0.3.2"
polonius-engine = "0.13.0"
rustc_apfloat = { path = "../rustc_apfloat" }
rustc_attr = { path = "../rustc_attr" }
2 changes: 1 addition & 1 deletion compiler/rustc_query_impl/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ doctest = false

[dependencies]
measureme = "10.0.0"
rustc-rayon-core = "0.3.1"
rustc-rayon-core = "0.3.2"
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
2 changes: 1 addition & 1 deletion compiler/rustc_query_system/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ doctest = false
[dependencies]
rustc_arena = { path = "../rustc_arena" }
tracing = "0.1"
rustc-rayon-core = "0.3.1"
rustc-rayon-core = "0.3.2"
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
arrayvec = { version = "0.7", default-features = false }
pulldown-cmark = { version = "0.9", default-features = false }
minifier = "0.0.41"
rayon = "1.3.1"
rayon = "1.5.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
smallvec = "1.6.1"
2 changes: 1 addition & 1 deletion src/tools/build-manifest/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@ anyhow = "1.0.32"
flate2 = "1.0.16"
tar = "0.4.29"
sha2 = "0.9.1"
rayon = "1.3.1"
rayon = "1.5.1"
hex = "0.4.2"
num_cpus = "1.13.0"
2 changes: 1 addition & 1 deletion src/tools/clippy/lintcheck/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ publish = false
clap = "2.33"
flate2 = "1.0"
fs_extra = "1.2"
rayon = "1.5"
rayon = "1.5.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tar = "0.4"
25 changes: 11 additions & 14 deletions src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
@@ -27,18 +27,17 @@ const LICENSES: &[&str] = &[
/// tooling. It is _crucial_ that no exception crates be dependencies
/// of the Rust runtime (std/test).
const EXCEPTIONS: &[(&str, &str)] = &[
("mdbook", "MPL-2.0"), // mdbook
("openssl", "Apache-2.0"), // cargo, mdbook
("colored", "MPL-2.0"), // rustfmt
("ordslice", "Apache-2.0"), // rls
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
("bytesize", "Apache-2.0"), // cargo
("im-rc", "MPL-2.0+"), // cargo
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
("bitmaps", "MPL-2.0+"), // cargo via im-rc
("crossbeam-queue", "MIT/Apache-2.0 AND BSD-2-Clause"), // rls via rayon
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
("snap", "BSD-3-Clause"), // rustc
("mdbook", "MPL-2.0"), // mdbook
("openssl", "Apache-2.0"), // cargo, mdbook
("colored", "MPL-2.0"), // rustfmt
("ordslice", "Apache-2.0"), // rls
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
("bytesize", "Apache-2.0"), // cargo
("im-rc", "MPL-2.0+"), // cargo
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
("bitmaps", "MPL-2.0+"), // cargo via im-rc
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
("snap", "BSD-3-Clause"), // rustc
// FIXME: this dependency violates the documentation comment above:
("fortanix-sgx-abi", "MPL-2.0"), // libstd but only for `sgx` target
];
@@ -97,7 +96,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"crc32fast",
"crossbeam-deque",
"crossbeam-epoch",
"crossbeam-queue",
"crossbeam-utils",
"cstr",
"datafrog",
@@ -135,7 +133,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
"lock_api",
"log",
"matchers",
"maybe-uninit",
"md-5",
"measureme",
"memchr",