diff options
| author | phaller <hallerp@gmail.com> | 2012-05-10 17:25:39 +0200 |
|---|---|---|
| committer | phaller <hallerp@gmail.com> | 2012-05-10 17:25:39 +0200 |
| commit | 3fdc05278918df210b0c2b859f4588e14051bd41 (patch) | |
| tree | 6b978fe63e99fb094ac47e4e91714b60a8ea7772 /src/library/scala/concurrent/impl/ExecutionContextImpl.scala | |
| parent | b0e85333a286075882352f66e59e5aa3f287e62e (diff) | |
| download | scala-3fdc05278918df210b0c2b859f4588e14051bd41.tar.gz scala-3fdc05278918df210b0c2b859f4588e14051bd41.tar.bz2 scala-3fdc05278918df210b0c2b859f4588e14051bd41.zip | |
Move resolver and resolveEither to impl.Promise
Diffstat (limited to 'src/library/scala/concurrent/impl/ExecutionContextImpl.scala')
| -rw-r--r-- | src/library/scala/concurrent/impl/ExecutionContextImpl.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala index 7dc3ed2988..3ed960c7ab 100644 --- a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala +++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala @@ -10,10 +10,10 @@ package scala.concurrent.impl -import java.util.concurrent.{Callable, Executor, ExecutorService, Executors, ThreadFactory} +import java.util.concurrent.{ Callable, Executor, ExecutorService, Executors, ThreadFactory } import scala.concurrent.forkjoin._ -import scala.concurrent.{ExecutionContext, resolver, Awaitable} -import scala.concurrent.util.{ Duration } +import scala.concurrent.{ ExecutionContext, Awaitable } +import scala.concurrent.util.Duration |