From a343b1d18002ce3aa306e48c6538bd9e48103e9a Mon Sep 17 00:00:00 2001
From: Sunjay Varma <sunjay@users.noreply.github.com>
Date: Thu, 14 May 2020 12:28:56 -0400
Subject: [PATCH] Clarifying that Handle::current must be called on a thread
 managed by tokio (#2493)

---
 tokio/src/runtime/handle.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tokio/src/runtime/handle.rs b/tokio/src/runtime/handle.rs
index c356f053b..0716a7fad 100644
--- a/tokio/src/runtime/handle.rs
+++ b/tokio/src/runtime/handle.rs
@@ -76,11 +76,13 @@ impl Handle {
         context::enter(self.clone(), f)
     }
 
-    /// Returns a Handle view over the currently running Runtime
+    /// Returns a `Handle` view over the currently running `Runtime`
     ///
     /// # Panic
     ///
-    /// This will panic if called outside the context of a Tokio runtime.
+    /// This will panic if called outside the context of a Tokio runtime. That means that you must
+    /// call this on one of the threads **being run by the runtime**. Calling this from within a
+    /// thread created by `std::thread::spawn` (for example) will cause a panic.
     ///
     /// # Examples
     ///
@@ -88,6 +90,7 @@ impl Handle {
     /// block or function running on that runtime.
     ///
     /// ```
+    /// # use std::thread;
     /// # use tokio::runtime::Runtime;
     /// # fn dox() {
     /// # let rt = Runtime::new().unwrap();
@@ -98,7 +101,16 @@ impl Handle {
     /// let handle = Handle::current();
     /// handle.spawn(async {
     ///     println!("now running in the existing Runtime");
-    /// })
+    /// });
+    ///
+    /// # let handle =
+    /// thread::spawn(move || {
+    ///     // Notice that the handle is created outside of this thread and then moved in
+    ///     handle.block_on(async { /* ... */ })
+    ///     // This next line would cause a panic
+    ///     // let handle2 = Handle::current();
+    /// });
+    /// # handle.join().unwrap();
     /// # });
     /// # }
     /// ```