Skip to content

Commit b67e444

Browse files
committed
Auto merge of #1040 - RalfJung:rustup, r=RalfJung
silence a lint that catches the bug statically
2 parents 5dc433a + a90ac3b commit b67e444

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e4931eaaa3d95189b30e90d3af9f0db17c41bbb0
1+
7a76fe76f756895b8cda1e10398f2268656a2e0f

test-cargo-miri/tests/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ 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.
4243
assert_eq!(num_cpus::get(), 1);
4344
}

tests/compile-fail/validity/invalid_wide_raw.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(invalid_value)]
2+
13
fn main() {
24
trait T { }
35
#[derive(Debug)]

0 commit comments

Comments
 (0)