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