diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-16 14:15:41 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-16 14:15:41 -0800 |
commit | 4de1a25c1c8db180269527976cb63bceee43d568 (patch) | |
tree | 331ed33cdf80dc1578fcad5ce1acbc41458157dd /src | |
parent | 49de2226c282285d099ac5903fe10b07e3087b5d (diff) | |
parent | ed7bd017852cf5e98d1a8089d0a0f6aefc0d4f68 (diff) | |
download | scala-4de1a25c1c8db180269527976cb63bceee43d568.tar.gz scala-4de1a25c1c8db180269527976cb63bceee43d568.tar.bz2 scala-4de1a25c1c8db180269527976cb63bceee43d568.zip |
Merge pull request #1614 from phaller/issue/correct-promise-signature
SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/concurrent/package.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/library/scala/concurrent/package.scala b/src/library/scala/concurrent/package.scala index f7c732b851..3e849f1722 100644 --- a/src/library/scala/concurrent/package.scala +++ b/src/library/scala/concurrent/package.scala @@ -29,13 +29,12 @@ package object concurrent { */ def future[T](body: =>T)(implicit execctx: ExecutionContext): Future[T] = Future[T](body) - /** Creates a promise object which can be completed with a value. + /** Creates a promise object which can be completed with a value or an exception. * * @tparam T the type of the value in the promise - * @param execctx the execution context on which the promise is created on * @return the newly created `Promise` object */ - def promise[T]()(implicit execctx: ExecutionContext): Promise[T] = Promise[T]() + def promise[T](): Promise[T] = Promise[T]() /** Used to designate a piece of code which potentially blocks, allowing the current [[BlockContext]] to adjust * the runtime's behavior. |