summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 10:21:04 +0100
committerAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 10:21:04 +0100
commit539aa7b6006b886fca3f963aa9d646e3511670b7 (patch)
treebb9a925c5d05f0eb0ffe13e494547d36238556ac
parent65e3857abce4c84f95aec5f689104d584b6968aa (diff)
downloadscala-539aa7b6006b886fca3f963aa9d646e3511670b7.tar.gz
scala-539aa7b6006b886fca3f963aa9d646e3511670b7.tar.bz2
scala-539aa7b6006b886fca3f963aa9d646e3511670b7.zip
A slight refactoring in promise and task factory methods.
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 4a3e112c1a..230f0de388 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -12,9 +12,9 @@ trait ExecutionContext {
def execute(task: Runnable): Unit
- def makeTask[T](task: () => T)(implicit timeout: Timeout): Task[T]
+ def task[T](task: () => T)(implicit timeout: Timeout): Task[T]
- def makePromise[T](implicit timeout: Timeout): Promise[T]
+ def promise[T](implicit timeout: Timeout): Promise[T]
def blockingCall[T](body: Blockable[T]): T