Permalink
Browse files

Merge pull request #1656 from jsuereth/fix/remove-future-either-method

Removing controversial `either` method from Futures API.
  • Loading branch information...
2 parents aef7912 + ea72460 commit 57b91c5ee794cb8b66e298594a95a3fc829171f6 @adriaanm adriaanm committed Nov 21, 2012
Showing with 0 additions and 23 deletions.
  1. +0 −23 src/library/scala/concurrent/Future.scala
View
23 src/library/scala/concurrent/Future.scala
@@ -522,29 +522,6 @@ trait Future[+T] extends Awaitable[T] {
p.future
}
- /** Creates a new future which holds the result of either this future or `that` future, depending on
- * which future was completed first.
- *
- * $nonDeterministic
- *
- * Example:
- * {{{
- * val f = future { sys.error("failed") }
- * val g = future { 5 }
- * val h = f either g
- * await(h, 0) // evaluates to either 5 or throws a runtime exception
- * }}}
- */
- def either[U >: T](that: Future[U]): Future[U] = {
- val p = Promise[U]()
- val completePromise: PartialFunction[Try[U], _] = { case result => p tryComplete result }
-
- this onComplete completePromise
- that onComplete completePromise
-
- p.future
- }
-
}

0 comments on commit 57b91c5

Please sign in to comment.