Skip to content

Commit 1a40227

Browse files
committed
Replace rayon with modified one
1 parent 7987b17 commit 1a40227

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Cargo.lock

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3167,8 +3167,7 @@ dependencies = [
31673167
[[package]]
31683168
name = "rustc-rayon-core"
31693169
version = "0.5.1"
3170-
source = "registry+https://github.com/rust-lang/crates.io-index"
3171-
checksum = "2f42932dcd3bcbe484b38a3ccf79b7906fac41c02d408b5b1bac26da3416efdb"
3170+
source = "git+https://github.com/zetanumbers/rayon?branch=rustc-remove-deadlock-detection#3b8d9c138ab70138c2016d19fbb2801a372614f6"
31723171
dependencies = [
31733172
"crossbeam-deque",
31743173
"crossbeam-utils",
@@ -6583,3 +6582,8 @@ dependencies = [
65836582
"quote",
65846583
"syn 2.0.101",
65856584
]
6585+
6586+
[[patch.unused]]
6587+
name = "rustc-rayon"
6588+
version = "0.5.1"
6589+
source = "git+https://github.com/zetanumbers/rayon?branch=rustc-remove-deadlock-detection#3b8d9c138ab70138c2016d19fbb2801a372614f6"

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ exclude = [
6060
"obj",
6161
]
6262

63+
[patch.crates-io]
64+
rustc-rayon = { git = "https://github.com/zetanumbers/rayon", branch = "rustc-remove-deadlock-detection" }
65+
rustc-rayon-core = { git = "https://github.com/zetanumbers/rayon", branch = "rustc-remove-deadlock-detection" }
66+
6367
[profile.release.package.rustc-rayon-core]
6468
# The rustc fork of Rayon has deadlock detection code which intermittently
6569
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)

src/tools/tidy/src/extdeps.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const ALLOWED_SOURCES: &[&str] = &[
88
r#""registry+https://github.com/rust-lang/crates.io-index""#,
99
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
1010
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
11+
r#""git+https://github.com/zetanumbers/rayon?branch=rustc-remove-deadlock-detection#3b8d9c138ab70138c2016d19fbb2801a372614f6""#,
1112
];
1213

1314
/// Checks for external package sources. `root` is the path to the directory that contains the

0 commit comments

Comments
 (0)