summaryrefslogtreecommitdiff
path: root/test/files/neg/deadline-inf-illegal.check
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/neg/deadline-inf-illegal.check
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/neg/deadline-inf-illegal.check')
-rw-r--r--test/files/neg/deadline-inf-illegal.check12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/deadline-inf-illegal.check b/test/files/neg/deadline-inf-illegal.check
index 2b9b25e48e..530d2b2443 100644
--- a/test/files/neg/deadline-inf-illegal.check
+++ b/test/files/neg/deadline-inf-illegal.check
@@ -1,15 +1,15 @@
-deadline-inf-illegal.scala:5: error: value fromNow is not a member of scala.concurrent.util.Duration
+deadline-inf-illegal.scala:5: error: value fromNow is not a member of scala.concurrent.duration.Duration
d.fromNow
^
deadline-inf-illegal.scala:6: error: type mismatch;
- found : scala.concurrent.util.Duration
- required: scala.concurrent.util.FiniteDuration
+ found : scala.concurrent.duration.Duration
+ required: scala.concurrent.duration.FiniteDuration
Deadline.now + d
^
deadline-inf-illegal.scala:7: error: overloaded method value - with alternatives:
- (other: scala.concurrent.util.Deadline)scala.concurrent.util.FiniteDuration <and>
- (other: scala.concurrent.util.FiniteDuration)scala.concurrent.util.Deadline
- cannot be applied to (scala.concurrent.util.Duration)
+ (other: scala.concurrent.duration.Deadline)scala.concurrent.duration.FiniteDuration <and>
+ (other: scala.concurrent.duration.FiniteDuration)scala.concurrent.duration.Deadline
+ cannot be applied to (scala.concurrent.duration.Duration)
Deadline.now - d
^
three errors found