Skip to content

Commit abab020

Browse files
committed
Auto merge of #1054 - RalfJung:win-num-cpus, r=RalfJung
test-cargo-miri: cargo update, re-enable windows num_cpus test
2 parents 2bdf163 + 5246242 commit abab020

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

test-cargo-miri/Cargo.lock

Lines changed: 20 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-cargo-miri/tests/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,5 @@ fn entropy_rng() {
3939

4040
#[test]
4141
fn num_cpus() {
42-
#[cfg(not(windows))] // FIXME: enable on Windows again once https://github.com/seanmonstar/num_cpus/pull/90 gets released.
4342
assert_eq!(num_cpus::get(), 1);
4443
}

0 commit comments

Comments
 (0)