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 /test | |
| 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 'test')
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index ba7dffbcb0..70221c0de1 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -13,7 +13,7 @@ import scala.concurrent.promise import scala.concurrent.blocking import scala.util.{ Try, Success, Failure } -import scala.util.Duration +import scala.concurrent.util.Duration trait TestBase { |