Skip to content

Commit 83f6ef1

Browse files
committed
Rustup to rustc 1.42.0-nightly (689fca01c 2020-01-17)
1 parent 3197971 commit 83f6ef1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

patches/0017-Fix-libtest-compilation.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ index 8b76080..9e65de2 100644
3939
let cfg = thread::Builder::new().name(name.as_slice().to_owned());
4040
cfg.spawn(runtest).unwrap();
4141
@@ -1531,17 +1531,8 @@ pub fn run_test(
42-
(benchfn.clone())(harness)
43-
});
42+
// Benchmarks aren't expected to panic, so we run them all in-process.
43+
crate::bench::benchmark(desc, monitor_ch, opts.nocapture, benchfn);
4444
}
4545
- DynTestFn(f) => {
4646
- match strategy {

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-01-14
1+
nightly-2020-01-18

0 commit comments

Comments
 (0)