From cbe369a3ed5c252ca7581e37986dc912d88e58c6 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Wed, 4 Dec 2019 10:51:23 -0800
Subject: [PATCH] Make JoinError Sync (#1888)

* Make JoinError Sync

* Move Mutex inside JoinError internals, hide its constructors

* Deprecate JoinError constructors, fix internal usages
---
 tokio/src/task/error.rs   | 19 +++++++++++++++----
 tokio/src/task/harness.rs |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/tokio/src/task/error.rs b/tokio/src/task/error.rs
index 7f7f53be6..9a2eceae7 100644
--- a/tokio/src/task/error.rs
+++ b/tokio/src/task/error.rs
@@ -1,6 +1,7 @@
 use std::any::Any;
 use std::fmt;
 use std::io;
+use std::sync::Mutex;
 
 doc_rt_core! {
     /// Task failed to execute to completion.
@@ -11,21 +12,31 @@ doc_rt_core! {
 
 enum Repr {
     Cancelled,
-    Panic(Box<dyn Any + Send + 'static>),
+    Panic(Mutex<Box<dyn Any + Send + 'static>>),
 }
 
 impl JoinError {
-    /// Create a new `cancelled` error
+    #[doc(hidden)]
+    #[deprecated]
     pub fn cancelled() -> JoinError {
+        Self::cancelled2()
+    }
+
+    pub(crate) fn cancelled2() -> JoinError {
         JoinError {
             repr: Repr::Cancelled,
         }
     }
 
-    /// Create a new `panic` error
+    #[doc(hidden)]
+    #[deprecated]
     pub fn panic(err: Box<dyn Any + Send + 'static>) -> JoinError {
+        Self::panic2(err)
+    }
+
+    pub(crate) fn panic2(err: Box<dyn Any + Send + 'static>) -> JoinError {
         JoinError {
-            repr: Repr::Panic(err),
+            repr: Repr::Panic(Mutex::new(err)),
         }
     }
 }
diff --git a/tokio/src/task/harness.rs b/tokio/src/task/harness.rs
index c02003db9..0aa9faeeb 100644
--- a/tokio/src/task/harness.rs
+++ b/tokio/src/task/harness.rs
@@ -142,7 +142,7 @@ where
                 }
             }
             Err(err) => {
-                self.complete(executor, join_interest, Err(JoinError::panic(err)));
+                self.complete(executor, join_interest, Err(JoinError::panic2(err)));
                 false
             }
         }
@@ -192,7 +192,7 @@ where
         state: Snapshot,
     ) {
         if state.is_canceled() {
-            dst.write(Track::new(Err(JoinError::cancelled())));
+            dst.write(Track::new(Err(JoinError::cancelled2())));
         } else {
             self.core().read_output(dst);
         }