From 9cdea312cf8373900ecb8d2f59b5e7348eab6ed8 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Wed, 29 Jan 2020 11:21:29 +0100 Subject: [PATCH] Rustup to rustc 1.42.0-nightly (3761dcd34 2020-01-28) --- patches/0022-core-Disable-not-compiling-tests.patch | 4 ++-- rust-toolchain | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/0022-core-Disable-not-compiling-tests.patch b/patches/0022-core-Disable-not-compiling-tests.patch index e001ba766fc..cd450a9af95 100644 --- a/patches/0022-core-Disable-not-compiling-tests.patch +++ b/patches/0022-core-Disable-not-compiling-tests.patch @@ -44,7 +44,7 @@ index 0475aeb..9558198 100644 --- a/src/libcore/tests/num/int_macros.rs +++ b/src/libcore/tests/num/int_macros.rs @@ -88,6 +88,7 @@ mod tests { - assert_eq!(C.count_zeros(), bits as u32 - 5); + assert_eq!(x.trailing_ones(), 0); } + /* @@ -64,7 +64,7 @@ index 04ed14f..a6e372e 100644 --- a/src/libcore/tests/num/uint_macros.rs +++ b/src/libcore/tests/num/uint_macros.rs @@ -52,6 +52,7 @@ mod tests { - assert!(C.count_zeros() == bits as u32 - 5); + assert_eq!(x.trailing_ones(), 0); } + /* diff --git a/rust-toolchain b/rust-toolchain index f8a3455b49b..96b21650675 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-01-25 +nightly-2020-01-29