summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphaller <hallerp@gmail.com>2012-11-13 17:45:11 +0100
committerphaller <hallerp@gmail.com>2012-11-15 17:15:21 +0100
commited7bd017852cf5e98d1a8089d0a0f6aefc0d4f68 (patch)
treef2304de1033b01561dde2f2f436fcbf98c4f41e3
parent8b598436f64ca4e980c8a38f642085b4d23e2327 (diff)
downloadscala-ed7bd017852cf5e98d1a8089d0a0f6aefc0d4f68.tar.gz
scala-ed7bd017852cf5e98d1a8089d0a0f6aefc0d4f68.tar.bz2
scala-ed7bd017852cf5e98d1a8089d0a0f6aefc0d4f68.zip
SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method
Clarification of @heathermiller: This is an inconsistency introduced after refactoring implicit ExecutionContexts. In commit 1dfce90246f7d334 the implicit ExecutionContexts were removed from everything else in Promise.scala, but it appears that method promise was missed in the scala.concurrent package object, which would've made sense to remove back then.
-rw-r--r--src/library/scala/concurrent/package.scala5
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.