Merge pull request scala/scala#8143 from takayahilton/awaitable-result-throws

Awaitable.result should have a throws annotation of TimeoutException and InterruptedException as well as Awaitable.ready

Author: SethTisue

library/src/scala/concurrent/Awaitable.scala

@@ -60,7 +60,8 @@ trait Awaitable[+T] {
    * @throws TimeoutException         if after waiting for the specified time this `Awaitable` is still not ready
    * @throws IllegalArgumentException if `atMost` is [[scala.concurrent.duration.Duration.Undefined Duration.Undefined]]
    */
-  @throws(classOf[Exception])
+  @throws(classOf[TimeoutException])
+  @throws(classOf[InterruptedException])
   def result(atMost: Duration)(implicit permit: CanAwait): T
 }
 

library/src/scala/concurrent/Future.scala

@@ -578,7 +578,8 @@ object Future {
       throw new TimeoutException(s"Future timed out after [$atMost]")
     }
 
-    @throws(classOf[Exception])
+    @throws(classOf[TimeoutException])
+    @throws(classOf[InterruptedException])
     override def result(atMost: Duration)(implicit permit: CanAwait): Nothing = {
       ready(atMost)
       throw new TimeoutException(s"Future timed out after [$atMost]")

library/src/scala/concurrent/package.scala

@@ -214,7 +214,8 @@ package concurrent {
      * @throws TimeoutException         if after waiting for the specified time `awaitable` is still not ready
      * @throws IllegalArgumentException if `atMost` is [[scala.concurrent.duration.Duration.Undefined Duration.Undefined]]
      */
-    @throws(classOf[Exception])
+    @throws(classOf[TimeoutException])
+    @throws(classOf[InterruptedException])
     def result[T](awaitable: Awaitable[T], atMost: Duration): T =
       blocking(awaitable.result(atMost)(AwaitPermission))
   }