From ea7246046ee7140ea07c8daa9c14cc2cd3111f5f Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 21 Nov 2012 08:29:41 -0500 Subject: Removing controversial `either` method from Futures API. * Removes `either` from Future * No tests need to change, since this was an untested method. --- src/library/scala/concurrent/Future.scala | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index 320a4f22b8..4b9e74708d 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/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 - } - } -- cgit v1.2.3