diff options
| author | bors <bors@rust-lang.org> | 2022-03-28 18:42:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-28 18:42:59 +0000 |
| commit | ee915c34e2f33a07856a9e39be7e35e648bfbd5d (patch) | |
| tree | 9932eb4cd774d38276337184a18432f49db158c8 /compiler/rustc_data_structures | |
| parent | 600ec284838c52d1f6657c2cf0097b58970b133b (diff) | |
| parent | 1f33cd1827b7e2d0f7e5ea0d4469f83f1cf19130 (diff) | |
| download | rust-ee915c34e2f33a07856a9e39be7e35e648bfbd5d.tar.gz rust-ee915c34e2f33a07856a9e39be7e35e648bfbd5d.zip | |
Auto merge of #95414 - Dylan-DPC:rollup-9hbshd0, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #93787 (parallel_compiler: hide dependencies behind feature) - #95318 (diagnostics: correct generic bounds with doubled colon) - #95328 (Fix yet another Box<T, A> ICE) - #95397 (Link to std::io's platform-specific behavior disclaimer) - #95407 (Inline u8::is_utf8_char_boundary) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/Cargo.toml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index b82e9717261..7cc8b5c2033 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -9,7 +9,7 @@ doctest = false [dependencies] arrayvec = { version = "0.7", default-features = false } ena = "0.14" -indexmap = { version = "1.8.0", features = ["rustc-rayon"] } +indexmap = { version = "1.8.0" } tracing = "0.1" jobserver_crate = { version = "0.1.13", package = "jobserver" } rustc_serialize = { path = "../rustc_serialize" } @@ -17,8 +17,8 @@ rustc_macros = { path = "../rustc_macros" } rustc_graphviz = { path = "../rustc_graphviz" } cfg-if = "0.1.2" stable_deref_trait = "1.0.0" -rayon = { version = "0.3.2", package = "rustc-rayon" } -rayon-core = { version = "0.3.2", package = "rustc-rayon-core" } +rayon = { version = "0.3.2", package = "rustc-rayon", optional = true } +rayon-core = { version = "0.3.2", package = "rustc-rayon-core", optional = true } rustc-hash = "1.1.0" smallvec = { version = "1.6.1", features = ["const_generics", "union", "may_dangle"] } rustc_index = { path = "../rustc_index", package = "rustc_index" } @@ -36,3 +36,6 @@ winapi = { version = "0.3", features = ["fileapi", "psapi", "winerror"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] memmap2 = "0.2.1" + +[features] +rustc_use_parallel_compiler = ["indexmap/rustc-rayon", "rayon", "rayon-core"] |