Skip to content

Commit 2ff1f45

Browse files
committed
revert num_cpus change
1 parent 82cb207 commit 2ff1f45

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/libtest/lib.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,12 @@ fn get_concurrency() -> usize {
11981198
1
11991199
}
12001200

1201+
#[cfg(target_os = "redox")]
1202+
fn num_cpus() -> usize {
1203+
// FIXME: Implement num_cpus on Redox
1204+
1
1205+
}
1206+
12011207
#[cfg(any(
12021208
all(target_arch = "wasm32", not(target_os = "emscripten")),
12031209
all(target_vendor = "fortanix", target_env = "sgx")
@@ -1215,7 +1221,6 @@ fn get_concurrency() -> usize {
12151221
target_os = "linux",
12161222
target_os = "macos",
12171223
target_os = "solaris",
1218-
target_os = "redox",
12191224
))]
12201225
fn num_cpus() -> usize {
12211226
unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as usize }

0 commit comments

Comments
 (0)