diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-03-20 17:51:27 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-03-20 17:51:27 +0100 |
| commit | c57699bc0214a3fef40bf5a656b569799b2365ea (patch) | |
| tree | fd239acee95d2bff8612021351d91336f30a376c /src/library/scala/concurrent/impl/ExecutionContextImpl.scala | |
| parent | 78c15103d54e58b0ecd193b90e2d56b967967d6c (diff) | |
| download | scala-c57699bc0214a3fef40bf5a656b569799b2365ea.tar.gz scala-c57699bc0214a3fef40bf5a656b569799b2365ea.tar.bz2 scala-c57699bc0214a3fef40bf5a656b569799b2365ea.zip | |
Cleaned up Duration for the standard library.
- Removed Timeout from the library. Each library should provide its own implementation of Timeout
- Removed duration package object and replaced it with regular object
- Removed usages of post Java 1.5 TimeUnit members
- Added factory methods for FiniteDuration
- Cleaned up some unnecessary comments
- Merged duration DSL with Duration.scala file
Review by: @phaller
Diffstat (limited to 'src/library/scala/concurrent/impl/ExecutionContextImpl.scala')
| -rw-r--r-- | src/library/scala/concurrent/impl/ExecutionContextImpl.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala index 7984aa02b7..dd1de2025e 100644 --- a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala +++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala @@ -13,7 +13,8 @@ package scala.concurrent.impl import java.util.concurrent.{Callable, ExecutorService} import scala.concurrent.forkjoin._ import scala.concurrent.{ExecutionContext, resolver, Awaitable, body2awaitable} -import scala.util.{ Duration, Try, Success, Failure } +import scala.util.{ Try, Success, Failure } +import scala.concurrent.util.{ Duration } import scala.collection.mutable.Stack |