summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authorphaller <hallerp@gmail.com>2012-05-10 17:25:39 +0200
committerphaller <hallerp@gmail.com>2012-05-10 17:25:39 +0200
commit3fdc05278918df210b0c2b859f4588e14051bd41 (patch)
tree6b978fe63e99fb094ac47e4e91714b60a8ea7772 /src/library/scala/concurrent/ExecutionContext.scala
parentb0e85333a286075882352f66e59e5aa3f287e62e (diff)
downloadscala-3fdc05278918df210b0c2b859f4588e14051bd41.tar.gz
scala-3fdc05278918df210b0c2b859f4588e14051bd41.tar.bz2
scala-3fdc05278918df210b0c2b859f4588e14051bd41.zip
Move resolver and resolveEither to impl.Promise
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 4666674b5b..d2a2d5e8a8 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -54,8 +54,7 @@ object ExecutionContext {
def fromExecutor(e: Executor, reporter: Throwable => Unit = defaultReporter): ExecutionContext with Executor = new impl.ExecutionContextImpl(e, reporter)
def defaultReporter: Throwable => Unit = {
- // `Error`s are currently wrapped by `resolver`.
- // Also, re-throwing `Error`s here causes an exception handling test to fail.
+ // re-throwing `Error`s here causes an exception handling test to fail.
//case e: Error => throw e
case t => t.printStackTrace()
}