Skip to content

Commit

Permalink
rustdoc: Switch to mainline rayon
Browse files Browse the repository at this point in the history
The rustc fork of rayon integrates with Cargo's jobserver to limit the
amount of parallelism. However, rustdoc's use case is concurrent I/O,
which is not CPU-heavy, so it should be able to use mainline rayon.

See this discussion [1] for more details.

[1]: rust-lang#90227 (comment)

Note: I chose rayon 1.3.1 so that the rayon version used elsewhere in
the workspace does not change.
  • Loading branch information
camelid committed Oct 29, 2021
1 parent c390d69 commit 7865a85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4615,8 +4615,8 @@ dependencies = [
"itertools 0.9.0",
"minifier",
"pulldown-cmark 0.8.0",
"rayon",
"regex",
"rustc-rayon",
"rustdoc-json-types",
"serde",
"serde_json",
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ path = "lib.rs"
arrayvec = { version = "0.7", default-features = false }
pulldown-cmark = { version = "0.8", default-features = false }
minifier = "0.0.41"
rayon = { version = "0.3.0", package = "rustc-rayon" }
rayon = "1.3.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
smallvec = "1.6.1"
Expand Down

0 comments on commit 7865a85

Please sign in to comment.