summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/library/scala/concurrent/package.scala2
-rw-r--r--test/files/jvm/scala-concurrent-tck.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/package.scala b/src/library/scala/concurrent/package.scala
index 0cdb52fb69..33e1b65993 100644
--- a/src/library/scala/concurrent/package.scala
+++ b/src/library/scala/concurrent/package.scala
@@ -55,7 +55,7 @@ package object concurrent {
def future[T](body: =>T)(implicit execCtx: ExecutionContext = executionContext): Future[T] =
execCtx future body
- def promise[T](implicit execCtx: ExecutionContext = executionContext): Promise[T] =
+ def promise[T]()(implicit execCtx: ExecutionContext = executionContext): Promise[T] =
execCtx promise
/** Used to block on a piece of code which potentially blocks.
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index ffe23de756..7d73e6cf7b 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -320,7 +320,7 @@ trait Promises extends TestBase {
def testSuccess(): Unit = once {
done =>
- val p = promise[Int]
+ val p = promise[Int]()
val f = p.future
f.onSuccess { x =>