From d14ad3588470cfe57cd1b14ca79758838254db4e Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 8 Dec 2019 11:32:03 +0100
Subject: [PATCH] Rustup to rustc 1.41.0-nightly (5c5c8eb86 2019-12-07)

---
 patches/0017-Fix-libtest-compilation.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/patches/0017-Fix-libtest-compilation.patch b/patches/0017-Fix-libtest-compilation.patch
index c76e2e2f8b4..ffde7ec3b62 100644
--- a/patches/0017-Fix-libtest-compilation.patch
+++ b/patches/0017-Fix-libtest-compilation.patch
@@ -71,9 +71,9 @@ index 8b76080..9e65de2 100644
      // Buffer for capturing standard I/O
      let data = Arc::new(Mutex::new(Vec::new()));
 @@ -1623,7 +1611,7 @@ fn run_test_in_process(desc: TestDesc,
-     } else {
-         None
      };
+ 
+     let start = report_time.then(Instant::now);
 -    let result = catch_unwind(AssertUnwindSafe(testfn));
 +    let result = Ok::<(), Box<dyn std::any::Any + Send>>(testfn());
      let exec_time = start.map(|start| {
@@ -93,4 +93,3 @@ index 8b76080..9e65de2 100644
          let test_result = match panic_info {
 -- 
 2.20.1
-