rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revert num_cpus change

Browse Source
This commit is contained in:
newpavlov
2019-08-21 20:16:52 +03:00
parent 82cb207607
commit 2ff1f45ead
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtest/lib.rs
View File

@@ -1198,6 +1198,12 @@ fn get_concurrency() -> usize {
1 1
} }
#[cfg(target_os = "redox")]
fn num_cpus() -> usize {
// FIXME: Implement num_cpus on Redox
1
}
#[cfg(any( #[cfg(any(
all(target_arch = "wasm32", not(target_os = "emscripten")), all(target_arch = "wasm32", not(target_os = "emscripten")),
all(target_vendor = "fortanix", target_env = "sgx") all(target_vendor = "fortanix", target_env = "sgx")
@@ -1215,7 +1221,6 @@ fn get_concurrency() -> usize {
target_os = "linux", target_os = "linux",
target_os = "macos", target_os = "macos",
target_os = "solaris", target_os = "solaris",
target_os = "redox",
))] ))]
fn num_cpus() -> usize { fn num_cpus() -> usize {
unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as usize } unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as usize }