diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-23 20:44:27 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-23 20:44:27 +0100 |
commit | ec0a860766467de78f4932431608d423705e1e41 (patch) | |
tree | d2dcc7b0a08a2df9c7508cd70292aedc2bd1019f | |
parent | 4d4eb913eccd6b8ef691ca249ec6d0f49649dc2e (diff) | |
parent | b690ef83c13dc04521fda7eea04db8aec6effa08 (diff) | |
download | scala-ec0a860766467de78f4932431608d423705e1e41.tar.gz scala-ec0a860766467de78f4932431608d423705e1e41.tar.bz2 scala-ec0a860766467de78f4932431608d423705e1e41.zip |
Merge pull request #4300 from CodeMettle/FiniteDuration.toCoarsest
Declare FiniteDuration.toCoarsest to return a FiniteDuration
-rw-r--r-- | src/library/scala/concurrent/duration/Duration.scala | 2 | ||||
-rw-r--r-- | test/files/run/duration-coarsest.scala | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/duration/Duration.scala b/src/library/scala/concurrent/duration/Duration.scala index 2eded9f060..3697950e2e 100644 --- a/src/library/scala/concurrent/duration/Duration.scala +++ b/src/library/scala/concurrent/duration/Duration.scala @@ -705,7 +705,7 @@ final class FiniteDuration(val length: Long, val unit: TimeUnit) extends Duratio final def isFinite() = true - final def toCoarsest: Duration = { + final override def toCoarsest: FiniteDuration = { def loop(length: Long, unit: TimeUnit): FiniteDuration = { def coarserOrThis(coarser: TimeUnit, divider: Int) = if (length % divider == 0) loop(length / divider, coarser) diff --git a/test/files/run/duration-coarsest.scala b/test/files/run/duration-coarsest.scala index 51cb79287a..81fbb3cc84 100644 --- a/test/files/run/duration-coarsest.scala +++ b/test/files/run/duration-coarsest.scala @@ -25,4 +25,7 @@ object Test extends App { 23 hours, 40 days ) foreach (x => assert(x == x.toCoarsest, x)) -}
\ No newline at end of file + + // toCoarsest on a FiniteDuration should return a FiniteDuration + val finite: FiniteDuration = 1.second.toCoarsest +} |