From 9d0901e07f499935551f0b0e5cc261a043476d57 Mon Sep 17 00:00:00 2001
From: Riley <asonix@asonix.dog>
Date: Sat, 6 Feb 2021 09:50:38 -0600
Subject: [PATCH] actix-rt: expose JoinError (#271)

---
 actix-rt/CHANGES.md | 3 +++
 actix-rt/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md
index 15052613..2e026425 100644
--- a/actix-rt/CHANGES.md
+++ b/actix-rt/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+* Expose JoinError from tokio. [#271]
+
+[#271]: https://github.com/actix/actix-net/pull/271
 
 
 ## 2.0.0 - 2021-02-02
diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs
index 831958aa..a7e9f309 100644
--- a/actix-rt/src/lib.rs
+++ b/actix-rt/src/lib.rs
@@ -91,7 +91,7 @@ pub mod time {
 pub mod task {
     //! Task management (Tokio re-exports).
 
-    pub use tokio::task::{spawn_blocking, yield_now, JoinHandle};
+    pub use tokio::task::{spawn_blocking, yield_now, JoinError, JoinHandle};
 }
 
 /// Spawns a future on the current thread.