summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2012-08-08 08:03:17 +0200
committerHeather Miller <heather.miller@epfl.ch>2012-08-08 08:03:17 +0200
commit540706a95d15b43dd94b5258477d36468e76474b (patch)
tree8aee0c19e20e71ed5f82da2a67c743a3b4b84843 /src/library/scala/concurrent/ExecutionContext.scala
parentea81ab3314359c98986e6fac74c807fa1accdfb6 (diff)
downloadscala-540706a95d15b43dd94b5258477d36468e76474b.tar.gz
scala-540706a95d15b43dd94b5258477d36468e76474b.tar.bz2
scala-540706a95d15b43dd94b5258477d36468e76474b.zip
Doc fix on exec ctx prepare method, fix to tests
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 82c1cff4b1..1be6050303 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -29,7 +29,8 @@ trait ExecutionContext {
def reportFailure(t: Throwable): Unit
/** Prepares for the execution of a task. Returns the prepared
- * execution context.
+ * execution context. A valid implementation of `prepare` is one
+ * that simply returns `this`.
*/
def prepare(): ExecutionContext = this