summaryrefslogtreecommitdiff
path: root/test/files/jvm/future-spec/FutureTests.scala
diff options
context:
space:
mode:
authorRoland <rk@rkuhn.info>2012-09-19 15:51:43 +0200
committerRoland <rk@rkuhn.info>2012-09-19 15:51:43 +0200
commit0ae9142bbee3e12f684d1af9a7e28ca795ba9f4f (patch)
tree4471b929756e3b6ce8d1c53a5e6ce6419340177c /test/files/jvm/future-spec/FutureTests.scala
parent625377f53ffc9244c96b17b3fc086bf81c3215d1 (diff)
downloadscala-0ae9142bbee3e12f684d1af9a7e28ca795ba9f4f.tar.gz
scala-0ae9142bbee3e12f684d1af9a7e28ca795ba9f4f.tar.bz2
scala-0ae9142bbee3e12f684d1af9a7e28ca795ba9f4f.zip
move Duration (incl. DSL) into scala.concurrent.duration package
so that the full package can be imported naturally: import scala.concurrent.duration._ will give you all the types (Duration, FiniteDuration, Deadline) and the DSL for constructing these.
Diffstat (limited to 'test/files/jvm/future-spec/FutureTests.scala')
-rw-r--r--test/files/jvm/future-spec/FutureTests.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala
index 31bb8c4e44..8674be168c 100644
--- a/test/files/jvm/future-spec/FutureTests.scala
+++ b/test/files/jvm/future-spec/FutureTests.scala
@@ -2,8 +2,8 @@
import scala.concurrent._
-import scala.concurrent.util.duration._
-import scala.concurrent.util.Duration.Inf
+import scala.concurrent.duration._
+import scala.concurrent.duration.Duration.Inf
import scala.collection._
import scala.runtime.NonLocalReturnControl
import scala.util.{Try,Success,Failure}