diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-02-01 13:16:06 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-02-01 13:16:06 +0100 |
| commit | 14bf00cda4922b778e2df72299a2a4e8fb2fd42b (patch) | |
| tree | 55207aa1d1dd4f8bc65d4869f863f5a409ee19d3 | |
| parent | 0d23e83d136436109c957fb44ac328bdfaa8a658 (diff) | |
| download | scala-14bf00cda4922b778e2df72299a2a4e8fb2fd42b.tar.gz scala-14bf00cda4922b778e2df72299a2a4e8fb2fd42b.tar.bz2 scala-14bf00cda4922b778e2df72299a2a4e8fb2fd42b.zip | |
Rename to recoverWith and fallbackTo in Future.
| -rw-r--r-- | src/library/scala/concurrent/Future.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |