diff --git a/rust-version b/rust-version index 6b17a5dbeb..1377ee94df 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -e4931eaaa3d95189b30e90d3af9f0db17c41bbb0 +c34472b77084c9f76f872871aeab121daf81fb99 diff --git a/test-cargo-miri/tests/test.rs b/test-cargo-miri/tests/test.rs index cfbe3f6d7f..904bbbc6cd 100644 --- a/test-cargo-miri/tests/test.rs +++ b/test-cargo-miri/tests/test.rs @@ -39,5 +39,6 @@ fn entropy_rng() { #[test] fn num_cpus() { + #[cfg(not(windows))] // FIXME: enable on Windows again once https://github.com/seanmonstar/num_cpus/pull/90 gets released. assert_eq!(num_cpus::get(), 1); } diff --git a/tests/compile-fail/validity/invalid_wide_raw.rs b/tests/compile-fail/validity/invalid_wide_raw.rs index ec14f6988b..8f1e184ed2 100644 --- a/tests/compile-fail/validity/invalid_wide_raw.rs +++ b/tests/compile-fail/validity/invalid_wide_raw.rs @@ -1,3 +1,5 @@ +#![allow(invalid_value)] + fn main() { trait T { } #[derive(Debug)] diff --git a/tests/run-pass/iter.rs b/tests/run-pass/iter.rs index 1bef21d83b..6192dd0d37 100644 --- a/tests/run-pass/iter.rs +++ b/tests/run-pass/iter.rs @@ -30,7 +30,7 @@ fn iter_any() { let h = |(), (), x: &u8| { 10u8 == *x }; h((), (), &1u8); - [1, 2, 3u8].into_iter().any(|elt| 10 == *elt); + [1, 2, 3u8].iter().any(|elt| 10 == *elt); } fn main() {