From 14bf00cda4922b778e2df72299a2a4e8fb2fd42b Mon Sep 17 00:00:00 2001
From: aleksandar <aleksandar@lampmac14.epfl.ch>
Date: Wed, 1 Feb 2012 13:16:06 +0100
Subject: Rename to recoverWith and fallbackTo in Future.

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

(limited to 'src/library')

diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index c87c51c0df..3650e44261 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -330,7 +330,7 @@ self =>
    *  future (6 / 0) rescue { case e: ArithmeticException => f } // result: Int.MaxValue
    *  }}}
    */
-  def tryRecover[U >: T](pf: PartialFunction[Throwable, Future[U]]): Future[U] = {
+  def recoverWith[U >: T](pf: PartialFunction[Throwable, Future[U]]): Future[U] = {
     val p = newPromise[U]
     
     onComplete {
@@ -388,7 +388,7 @@ self =>
    *  await(0) h // evaluates to 5
    *  }}}
    */
-  def orElse[U >: T](that: Future[U]): Future[U] = {
+  def fallbackTo[U >: T](that: Future[U]): Future[U] = {
     val p = newPromise[U]
     
     onComplete {
-- 
cgit v1.2.3