diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-04 17:31:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 17:31:05 +0100 |
| commit | 5115bdc2e2829e9c9a7ce10516bd26469049e0a9 (patch) | |
| tree | 87a1138d9a25eeb5eae806a30ecff0287051c6d9 /compiler/rustc_session/src | |
| parent | 904c6ca95c65b71715491b9e32f634734661db94 (diff) | |
| parent | 2d854f9c340df887e30896f49270ae81feb3e227 (diff) | |
Rollup merge of #94524 - bjorn3:remove_num_cpus, r=Mark-Simulacrum
Remove num_cpus dependency from bootstrap, build-manifest and rustc_s… …ession `std::threads::available_parallelism` was stabilized in rust 1.59. r? ```````````````````````````@Mark-Simulacrum```````````````````````````
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/options.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index 17eec333e09..c42a1530451 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -551,7 +551,7 @@ mod parse { crate fn parse_threads(slot: &mut usize, v: Option<&str>) -> bool { match v.and_then(|s| s.parse().ok()) { Some(0) => { - *slot = ::num_cpus::get(); + *slot = std::thread::available_parallelism().map_or(1, std::num::NonZeroUsize::get); true } Some(i) => { |