Auto merge of #8491 - matthiaskrgr:no_num_cpus, r=flip1995

tests: use std:🧵:available_parallelism() instead of num_cpus to get thread count

removes the dependency added in https://github.com/rust-lang/rust-clippy/pull/8451
---

*Please write a short comment explaining your change (or "none" for internal only changes)*

changelog: tests: use std:🧵:available_parallelism() instead of num_cpus to get thread count
This commit is contained in:
bors 2022-03-02 09:26:11 +00:00
commit 1a25d190e7
2 changed files with 5 additions and 2 deletions

View File

@ -51,7 +51,6 @@ futures = "0.3"
parking_lot = "0.11.2"
tokio = { version = "1", features = ["io-util"] }
rustc-semver = "1.1"
num_cpus = "1.13"
[build-dependencies]
rustc_tools_util = { version = "0.2", path = "rustc_tools_util" }

View File

@ -168,7 +168,11 @@ fn run_ui() {
let _threads = VarGuard::set(
"RUST_TEST_THREADS",
// if RUST_TEST_THREADS is set, adhere to it, otherwise override it
env::var("RUST_TEST_THREADS").unwrap_or_else(|_| num_cpus::get().to_string()),
env::var("RUST_TEST_THREADS").unwrap_or_else(|_| {
std::thread::available_parallelism()
.map_or(1, std::num::NonZeroUsize::get)
.to_string()
}),
);
compiletest::run_tests(&config);
}