diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-04-17 17:40:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-17 17:40:30 +0200 |
| commit | b79996d97d7d11cdfab35545d2299c8e03317e2f (patch) | |
| tree | 0bdf22ff04f2b4f9665adf833c6bb2658cd66399 | |
| parent | dce750644f7e39fa4c3b1309bd0ee8635e089bd1 (diff) | |
| parent | b4b9cfbbd3d06b3b025205837a6e602dcf1e311b (diff) | |
| download | rust-b79996d97d7d11cdfab35545d2299c8e03317e2f.tar.gz rust-b79996d97d7d11cdfab35545d2299c8e03317e2f.zip | |
Rollup merge of #139935 - cuviper:rustc-rayon-core-0.5.1, r=lqd
Upgrade to `rustc-rayon-core` 0.5.1 * [Fix a race with deadlock detection](https://github.com/rust-lang/rustc-rayon/pull/15) * [Cherry-pick changes from upstream rayon-core](https://github.com/rust-lang/rustc-rayon/pull/16) - This also removes a few dependencies from rustc's tidy list.
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 3d0e2942179..684dfbca6f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3199,14 +3199,12 @@ dependencies = [ [[package]] name = "rustc-rayon-core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67668daaf00e359c126f6dcb40d652d89b458a008c8afa727a42a2d20fca0b7f" +checksum = "2f42932dcd3bcbe484b38a3ccf79b7906fac41c02d408b5b1bac26da3416efdb" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index fd8e4eacc0f..dd7f9c6b146 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -260,7 +260,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "constant_time_eq", "cpufeatures", "crc32fast", - "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", "crossbeam-utils", @@ -295,7 +294,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "gimli", "gsgdt", "hashbrown", - "hermit-abi", "icu_list", "icu_list_data", "icu_locid", @@ -329,7 +327,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "miniz_oxide", "nix", "nu-ansi-term", - "num_cpus", "object", "odht", "once_cell", |