From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 18 Jan 2020 18:14:03 +0000 (+0100)
Subject: Rustup to rustc 1.42.0-nightly (689fca01c 2020-01-17)
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=83f6ef1558f35b206d000043943e8249c787827d;hp=319797109522b85d061c97f0b63b0c7d4ab4152e;p=rust.git

Rustup to rustc 1.42.0-nightly (689fca01c 2020-01-17)
---

diff --git a/patches/0017-Fix-libtest-compilation.patch b/patches/0017-Fix-libtest-compilation.patch
index 5592818474e..5299fb2b465 100644
--- a/patches/0017-Fix-libtest-compilation.patch
+++ b/patches/0017-Fix-libtest-compilation.patch
@@ -39,8 +39,8 @@ index 8b76080..9e65de2 100644
              let cfg = thread::Builder::new().name(name.as_slice().to_owned());
              cfg.spawn(runtest).unwrap();
 @@ -1531,17 +1531,8 @@ pub fn run_test(
-                 (benchfn.clone())(harness)
-             });
+             // Benchmarks aren't expected to panic, so we run them all in-process.
+             crate::bench::benchmark(desc, monitor_ch, opts.nocapture, benchfn);
          }
 -        DynTestFn(f) => {
 -            match strategy {
diff --git a/rust-toolchain b/rust-toolchain
index 15374cf4ecd..238b1af4395 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-01-14
+nightly-2020-01-18