Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 42852d7

Browse files
borsbors
committed
Auto merge of rust-lang#92740 - cuviper:update-rayons, r=Mark-Simulacrum
Update rayon and rustc-rayon This updates rayon for various tools and rustc-rayon for the compiler's parallel mode. - rayon v1.3.1 -> v1.5.1 - rayon-core v1.7.1 -> v1.9.1 - rustc-rayon v0.3.1 -> v0.3.2 - rustc-rayon-core v0.3.1 -> v0.3.2 ... and indirectly, this updates all of crossbeam-* to their latest versions. Fixes rust-lang#92677 by removing crossbeam-queue, but there's still a lingering question about how tidy discovers "runtime" dependencies. None of this is truly in the standard library's dependency tree at all.
2 parents 26c06cf + f3b8812 commit 42852d7

File tree

10 files changed

+53
-88
lines changed

10 files changed

+53
-88
lines changed

‎Cargo.lock‎

Lines changed: 31 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ dependencies = [
337337
"cargo-util",
338338
"clap 3.0.6",
339339
"crates-io",
340-
"crossbeam-utils 0.8.3",
340+
"crossbeam-utils",
341341
"curl",
342342
"curl-sys",
343343
"env_logger 0.9.0",
@@ -857,69 +857,44 @@ dependencies = [
857857

858858
[[package]]
859859
name = "crossbeam-channel"
860-
version = "0.5.0"
860+
version = "0.5.2"
861861
source = "registry+https://github.com/rust-lang/crates.io-index"
862-
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
862+
checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
863863
dependencies = [
864864
"cfg-if 1.0.0",
865-
"crossbeam-utils 0.8.3",
865+
"crossbeam-utils",
866866
]
867867

868868
[[package]]
869869
name = "crossbeam-deque"
870-
version = "0.7.4"
870+
version = "0.8.1"
871871
source = "registry+https://github.com/rust-lang/crates.io-index"
872-
checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
872+
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
873873
dependencies = [
874+
"cfg-if 1.0.0",
874875
"crossbeam-epoch",
875-
"crossbeam-utils 0.7.2",
876-
"maybe-uninit",
876+
"crossbeam-utils",
877877
]
878878

879879
[[package]]
880880
name = "crossbeam-epoch"
881-
version = "0.8.2"
881+
version = "0.9.6"
882882
source = "registry+https://github.com/rust-lang/crates.io-index"
883-
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
883+
checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
884884
dependencies = [
885-
"autocfg",
886-
"cfg-if 0.1.10",
887-
"crossbeam-utils 0.7.2",
885+
"cfg-if 1.0.0",
886+
"crossbeam-utils",
888887
"lazy_static",
889-
"maybe-uninit",
890888
"memoffset",
891889
"scopeguard",
892890
]
893891

894-
[[package]]
895-
name = "crossbeam-queue"
896-
version = "0.2.3"
897-
source = "registry+https://github.com/rust-lang/crates.io-index"
898-
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
899-
dependencies = [
900-
"cfg-if 0.1.10",
901-
"crossbeam-utils 0.7.2",
902-
"maybe-uninit",
903-
]
904-
905-
[[package]]
906-
name = "crossbeam-utils"
907-
version = "0.7.2"
908-
source = "registry+https://github.com/rust-lang/crates.io-index"
909-
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
910-
dependencies = [
911-
"autocfg",
912-
"cfg-if 0.1.10",
913-
"lazy_static",
914-
]
915-
916892
[[package]]
917893
name = "crossbeam-utils"
918-
version = "0.8.3"
894+
version = "0.8.6"
919895
source = "registry+https://github.com/rust-lang/crates.io-index"
920-
checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
896+
checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
921897
dependencies = [
922-
"autocfg",
923898
"cfg-if 1.0.0",
924899
"lazy_static",
925900
]
@@ -1725,7 +1700,7 @@ version = "0.4.17"
17251700
source = "registry+https://github.com/rust-lang/crates.io-index"
17261701
checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
17271702
dependencies = [
1728-
"crossbeam-utils 0.8.3",
1703+
"crossbeam-utils",
17291704
"globset",
17301705
"lazy_static",
17311706
"log",
@@ -2195,12 +2170,6 @@ version = "0.1.8"
21952170
source = "registry+https://github.com/rust-lang/crates.io-index"
21962171
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
21972172

2198-
[[package]]
2199-
name = "maybe-uninit"
2200-
version = "2.0.0"
2201-
source = "registry+https://github.com/rust-lang/crates.io-index"
2202-
checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
2203-
22042173
[[package]]
22052174
name = "md-5"
22062175
version = "0.9.1"
@@ -2289,9 +2258,9 @@ dependencies = [
22892258

22902259
[[package]]
22912260
name = "memoffset"
2292-
version = "0.5.5"
2261+
version = "0.6.5"
22932262
source = "registry+https://github.com/rust-lang/crates.io-index"
2294-
checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
2263+
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
22952264
dependencies = [
22962265
"autocfg",
22972266
]
@@ -3101,9 +3070,9 @@ dependencies = [
31013070

31023071
[[package]]
31033072
name = "rayon"
3104-
version = "1.3.1"
3073+
version = "1.5.1"
31053074
source = "registry+https://github.com/rust-lang/crates.io-index"
3106-
checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
3075+
checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
31073076
dependencies = [
31083077
"autocfg",
31093078
"crossbeam-deque",
@@ -3113,13 +3082,13 @@ dependencies = [
31133082

31143083
[[package]]
31153084
name = "rayon-core"
3116-
version = "1.7.1"
3085+
version = "1.9.1"
31173086
source = "registry+https://github.com/rust-lang/crates.io-index"
3118-
checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
3087+
checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
31193088
dependencies = [
3089+
"crossbeam-channel",
31203090
"crossbeam-deque",
3121-
"crossbeam-queue",
3122-
"crossbeam-utils 0.7.2",
3091+
"crossbeam-utils",
31233092
"lazy_static",
31243093
"num_cpus",
31253094
]
@@ -3372,7 +3341,7 @@ dependencies = [
33723341
"arrayvec",
33733342
"bitflags",
33743343
"cfg-if 0.1.10",
3375-
"crossbeam-utils 0.8.3",
3344+
"crossbeam-utils",
33763345
"ena",
33773346
"indexmap",
33783347
"jobserver",
@@ -3599,9 +3568,9 @@ dependencies = [
35993568

36003569
[[package]]
36013570
name = "rustc-rayon"
3602-
version = "0.3.1"
3571+
version = "0.3.2"
36033572
source = "registry+https://github.com/rust-lang/crates.io-index"
3604-
checksum = "ed7d6a39f8bfd4421ce720918234d1e672b83824c91345b47c93746839cf1629"
3573+
checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246"
36053574
dependencies = [
36063575
"crossbeam-deque",
36073576
"either",
@@ -3610,13 +3579,12 @@ dependencies = [
36103579

36113580
[[package]]
36123581
name = "rustc-rayon-core"
3613-
version = "0.3.1"
3582+
version = "0.3.2"
36143583
source = "registry+https://github.com/rust-lang/crates.io-index"
3615-
checksum = "e94187d9ea3e8c38fafdbc38acb94eafa7ce155867f6ccb13830466a0d0db8c6"
3584+
checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500"
36163585
dependencies = [
36173586
"crossbeam-deque",
3618-
"crossbeam-queue",
3619-
"crossbeam-utils 0.7.2",
3587+
"crossbeam-utils",
36203588
"lazy_static",
36213589
"num_cpus",
36223590
]
@@ -3654,7 +3622,7 @@ version = "1.0.0"
36543622
dependencies = [
36553623
"bstr",
36563624
"byteorder",
3657-
"crossbeam-utils 0.8.3",
3625+
"crossbeam-utils",
36583626
"libc",
36593627
"libz-sys",
36603628
"proc-macro2",
@@ -5417,7 +5385,7 @@ name = "tidy"
54175385
version = "0.1.0"
54185386
dependencies = [
54195387
"cargo_metadata 0.12.0",
5420-
"crossbeam-utils 0.8.3",
5388+
"crossbeam-utils",
54215389
"lazy_static",
54225390
"regex",
54235391
"walkdir",

‎compiler/rustc_data_structures/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ rustc_macros = { path = "../rustc_macros" }
1717
rustc_graphviz = { path = "../rustc_graphviz" }
1818
cfg-if = "0.1.2"
1919
stable_deref_trait = "1.0.0"
20-
rayon = { version = "0.3.1", package = "rustc-rayon" }
21-
rayon-core = { version = "0.3.1", package = "rustc-rayon-core" }
20+
rayon = { version = "0.3.2", package = "rustc-rayon" }
21+
rayon-core = { version = "0.3.2", package = "rustc-rayon-core" }
2222
rustc-hash = "1.1.0"
2323
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
2424
rustc_index = { path = "../rustc_index", package = "rustc_index" }

‎compiler/rustc_interface/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ doctest = false
1010
libc = "0.2"
1111
libloading = "0.7.1"
1212
tracing = "0.1"
13-
rustc-rayon-core = "0.3.1"
14-
rayon = { version = "0.3.1", package = "rustc-rayon" }
13+
rustc-rayon-core = "0.3.2"
14+
rayon = { version = "0.3.2", package = "rustc-rayon" }
1515
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
1616
rustc_ast = { path = "../rustc_ast" }
1717
rustc_attr = { path = "../rustc_attr" }

‎compiler/rustc_middle/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ bitflags = "1.2.1"
1212
either = "1.5.0"
1313
gsgdt = "0.1.2"
1414
tracing = "0.1"
15-
rustc-rayon = "0.3.1"
16-
rustc-rayon-core = "0.3.1"
15+
rustc-rayon = "0.3.2"
16+
rustc-rayon-core = "0.3.2"
1717
polonius-engine = "0.13.0"
1818
rustc_apfloat = { path = "../rustc_apfloat" }
1919
rustc_attr = { path = "../rustc_attr" }

‎compiler/rustc_query_impl/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ doctest = false
88

99
[dependencies]
1010
measureme = "10.0.0"
11-
rustc-rayon-core = "0.3.1"
11+
rustc-rayon-core = "0.3.2"
1212
rustc_ast = { path = "../rustc_ast" }
1313
rustc_data_structures = { path = "../rustc_data_structures" }
1414
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_query_system/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ doctest = false
99
[dependencies]
1010
rustc_arena = { path = "../rustc_arena" }
1111
tracing = "0.1"
12-
rustc-rayon-core = "0.3.1"
12+
rustc-rayon-core = "0.3.2"
1313
rustc_ast = { path = "../rustc_ast" }
1414
rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_errors = { path = "../rustc_errors" }

‎src/librustdoc/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ arrayvec = { version = "0.7", default-features = false }
1111
askama = { version = "0.11", default-features = false }
1212
pulldown-cmark = { version = "0.9", default-features = false }
1313
minifier = "0.0.41"
14-
rayon = "1.3.1"
14+
rayon = "1.5.1"
1515
serde = { version = "1.0", features = ["derive"] }
1616
serde_json = "1.0"
1717
smallvec = "1.6.1"

‎src/tools/build-manifest/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ anyhow = "1.0.32"
1111
flate2 = "1.0.16"
1212
tar = "0.4.29"
1313
sha2 = "0.9.1"
14-
rayon = "1.3.1"
14+
rayon = "1.5.1"
1515
hex = "0.4.2"
1616
num_cpus = "1.13.0"

‎src/tools/clippy/lintcheck/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313
clap = "2.33"
1414
flate2 = "1.0"
1515
fs_extra = "1.2"
16-
rayon = "1.5"
16+
rayon = "1.5.1"
1717
serde = { version = "1.0", features = ["derive"] }
1818
serde_json = "1.0"
1919
tar = "0.4"

‎src/tools/tidy/src/deps.rs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,17 @@ const LICENSES: &[&str] = &[
2727
/// tooling. It is _crucial_ that no exception crates be dependencies
2828
/// of the Rust runtime (std/test).
2929
const EXCEPTIONS: &[(&str, &str)] = &[
30-
("mdbook", "MPL-2.0"), // mdbook
31-
("openssl", "Apache-2.0"), // cargo, mdbook
32-
("colored", "MPL-2.0"), // rustfmt
33-
("ordslice", "Apache-2.0"), // rls
34-
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
35-
("bytesize", "Apache-2.0"), // cargo
36-
("im-rc", "MPL-2.0+"), // cargo
37-
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
38-
("bitmaps", "MPL-2.0+"), // cargo via im-rc
39-
("crossbeam-queue", "MIT/Apache-2.0 AND BSD-2-Clause"), // rls via rayon
40-
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
41-
("snap", "BSD-3-Clause"), // rustc
30+
("mdbook", "MPL-2.0"), // mdbook
31+
("openssl", "Apache-2.0"), // cargo, mdbook
32+
("colored", "MPL-2.0"), // rustfmt
33+
("ordslice", "Apache-2.0"), // rls
34+
("ryu", "Apache-2.0 OR BSL-1.0"), // rls/cargo/... (because of serde)
35+
("bytesize", "Apache-2.0"), // cargo
36+
("im-rc", "MPL-2.0+"), // cargo
37+
("sized-chunks", "MPL-2.0+"), // cargo via im-rc
38+
("bitmaps", "MPL-2.0+"), // cargo via im-rc
39+
("instant", "BSD-3-Clause"), // rustc_driver/tracing-subscriber/parking_lot
40+
("snap", "BSD-3-Clause"), // rustc
4241
// FIXME: this dependency violates the documentation comment above:
4342
("fortanix-sgx-abi", "MPL-2.0"), // libstd but only for `sgx` target
4443
];
@@ -98,7 +97,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
9897
"crc32fast",
9998
"crossbeam-deque",
10099
"crossbeam-epoch",
101-
"crossbeam-queue",
102100
"crossbeam-utils",
103101
"cstr",
104102
"datafrog",
@@ -136,7 +134,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
136134
"lock_api",
137135
"log",
138136
"matchers",
139-
"maybe-uninit",
140137
"md-5",
141138
"measureme",
142139
"memchr",

0 commit comments

Comments
 (0)