summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/default/TaskImpl.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/concurrent/default/TaskImpl.scala b/src/library/scala/concurrent/default/TaskImpl.scala
index b4c08ba710..ea465225c8 100644
--- a/src/library/scala/concurrent/default/TaskImpl.scala
+++ b/src/library/scala/concurrent/default/TaskImpl.scala
@@ -91,7 +91,7 @@ private[concurrent] class PromiseImpl[T](context: ExecutionContextImpl)
*
* $promiseCompletion
*/
- def fulfill(value: T): Unit = {
+ def success(value: T): Unit = {
val cbs = tryCompleteState(Success(value))
if (cbs == null)
throw new IllegalStateException
@@ -109,7 +109,7 @@ private[concurrent] class PromiseImpl[T](context: ExecutionContextImpl)
*
* $promiseCompletion
*/
- def break(t: Throwable): Unit = {
+ def failure(t: Throwable): Unit = {
val wrapped = wrap(t)
val cbs = tryCompleteState(Failure(wrapped))
if (cbs == null)
@@ -260,7 +260,7 @@ private[concurrent] final class ExecutionContextImpl extends ExecutionContext {
}
def promise[T]: Promise[T] =
- null // TODO
+ new PromiseImpl[T](this)
// TODO fix the timeout
def blockingCall[T](timeout: Timeout, b: Blockable[T]): T = b match {