--- a/src/Pure/Concurrent/future.scala Wed Apr 23 15:22:48 2014 +0200
+++ b/src/Pure/Concurrent/future.scala Wed Apr 23 15:57:06 2014 +0200
@@ -41,7 +41,7 @@
trait Promise[A] extends Future[A]
{
def fulfill_result(res: Exn.Result[A]): Unit
- def fulfill(x: A) { fulfill_result(Exn.Res(x)) }
+ def fulfill(x: A): Unit
}
@@ -62,7 +62,6 @@
override def is_finished: Boolean = future.isCompleted
def join: A = Await.result(future, Duration.Inf)
-
override def map[B](f: A => B): Future[B] = new Pending_Future[B](future.map(f))
}
@@ -71,12 +70,11 @@
{
override def is_finished: Boolean = promise.isCompleted
- override def fulfill_result(res: Exn.Result[A]): Unit =
+ def fulfill_result(res: Exn.Result[A]): Unit =
res match {
case Exn.Res(x) => promise.success(x)
case Exn.Exn(e) => promise.failure(e)
}
-
- override def fulfill(x: A): Unit = promise.success(x)
+ def fulfill(x: A): Unit = promise.success(x)
}