Updating to latest version of Akka's DefaultPromise

1 files changed, 9 insertions, 11 deletions

diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 1463dbcebf..16432f6aac 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -511,16 +511,15 @@ trait Future[+T] extends Awaitable[T] {
  *  Note: using this method yields nondeterministic dataflow programs.
  */
 object Future {
-  
-  /** Starts an asynchronous computation and returns a `Future` object with the result of that computation.
-   *  
-   *  The result becomes available once the asynchronous computation is completed.
-   *  
-   *  @tparam T       the type of the result
-   *  @param body     the asychronous computation
-   *  @param execctx  the execution context on which the future is run
-   *  @return         the `Future` holding the result of the computation
-   */
+ /** Starts an asynchronous computation and returns a `Future` object with the result of that computation.
+  *
+  *  The result becomes available once the asynchronous computation is completed.
+  *
+  *  @tparam T       the type of the result
+  *  @param body     the asychronous computation
+  *  @param execctx  the execution context on which the future is run
+  *  @return         the `Future` holding the result of the computation
+  */
   def apply[T](body: =>T)(implicit executor: ExecutionContext): Future[T] = impl.Future(body)
 
   import scala.collection.mutable.Builder
@@ -614,4 +613,3 @@ object Future {
 
 
 
-