diff options
| author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 16:53:33 +0100 |
|---|---|---|
| committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2011-12-13 16:53:33 +0100 |
| commit | a458396b461669129d28f45e92265560a584619b (patch) | |
| tree | 42804a5fb4947880cdf28c270b5a1650f65c6bf5 | |
| parent | c3477895c08397234a4a103911a4b55517a440b6 (diff) | |
| download | scala-a458396b461669129d28f45e92265560a584619b.tar.gz scala-a458396b461669129d28f45e92265560a584619b.tar.bz2 scala-a458396b461669129d28f45e92265560a584619b.zip | |
Change promise method signature.
| -rw-r--r-- | src/library/scala/concurrent/package.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 2 |
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 => |