diff options
| author | bors <bors@rust-lang.org> | 2022-01-16 08:12:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-16 08:12:23 +0000 |
| commit | 42852d7857d2955f19ec333bec1ed107964db200 (patch) | |
| tree | ae7aae62e98c28f9940dd510dc3a6b7575523dea /src | |
| parent | 26c06cf8e27e5fa06b4894f14588c187510bae47 (diff) | |
| parent | f3b8812f2473b49453e79c3f57acf4fa4c2ca227 (diff) | |
| download | rust-42852d7857d2955f19ec333bec1ed107964db200.tar.gz rust-42852d7857d2955f19ec333bec1ed107964db200.zip | |
Auto merge of #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 #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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/build-manifest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/clippy/lintcheck/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 25 |
4 files changed, 14 insertions, 17 deletions
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 5025342c1d6..bdf756df6fd 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -11,7 +11,7 @@ arrayvec = { version = "0.7", default-features = false } askama = { version = "0.11", 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" diff --git a/src/tools/build-manifest/Cargo.toml b/src/tools/build-manifest/Cargo.toml index 340acff34f2..dedafd85cfd 100644 --- a/src/tools/build-manifest/Cargo.toml +++ b/src/tools/build-manifest/Cargo.toml @@ -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" diff --git a/src/tools/clippy/lintcheck/Cargo.toml b/src/tools/clippy/lintcheck/Cargo.toml index f33f1b65eab..c694037021a 100644 --- a/src/tools/clippy/lintcheck/Cargo.toml +++ b/src/tools/clippy/lintcheck/Cargo.toml @@ -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" diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 9d2aa0f21c8..3bdd6a29537 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -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 ]; @@ -98,7 +97,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "crc32fast", "crossbeam-deque", "crossbeam-epoch", - "crossbeam-queue", "crossbeam-utils", "cstr", "datafrog", @@ -136,7 +134,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "lock_api", "log", "matchers", - "maybe-uninit", "md-5", "measureme", "memchr", |
