From ce0bfa62aa18f2b153aa5690ed34bf05f71bb7eb Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Fri, 3 Feb 2012 10:07:07 +0100
Subject: Fix typo in Future trait. Simplify recoverWith.

---
 src/library/scala/concurrent/Future.scala | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/library')

diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 3650e44261..73f76bbbfb 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -327,7 +327,7 @@ self =>
    *  
    *  {{{
    *  val f = future { Int.MaxValue }
-   *  future (6 / 0) rescue { case e: ArithmeticException => f } // result: Int.MaxValue
+   *  future (6 / 0) recoverWith { case e: ArithmeticException => f } // result: Int.MaxValue
    *  }}}
    */
   def recoverWith[U >: T](pf: PartialFunction[Throwable, Future[U]]): Future[U] = {
@@ -336,10 +336,7 @@ self =>
     onComplete {
       case Failure(t) if pf isDefinedAt t =>
         try {
-          pf(t) onComplete {
-            case Failure(t) => p failure t
-            case Success(v) => p success v
-          }
+          p completeWith pf(t)
         } catch {
           case t: Throwable => p complete resolver(t)
         }
-- 
cgit v1.2.3