# HG changeset patch # User wenzelm # Date 1398261426 -7200 # Node ID 70cc1164fb83d325e16664119adc1cea7d31c685 # Parent 42bf8fffdf6a44d49cb55798bd10d599a96146fc tuned; diff -r 42bf8fffdf6a -r 70cc1164fb83 src/Pure/Concurrent/future.scala --- 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) }