From 365cbb94cdfdde4edcafbfd929cb795e908bcd44 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 30 May 2019 20:52:55 +0300 Subject: [PATCH] Change Duration.absoluteValue to property --- libraries/stdlib/src/kotlin/time/Duration.kt | 6 +++--- libraries/stdlib/test/time/DurationTest.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/stdlib/src/kotlin/time/Duration.kt b/libraries/stdlib/src/kotlin/time/Duration.kt index ece0feb918e..2a1315c246f 100644 --- a/libraries/stdlib/src/kotlin/time/Duration.kt +++ b/libraries/stdlib/src/kotlin/time/Duration.kt @@ -56,7 +56,7 @@ public inline class Duration internal constructor(internal val _value: Double) : fun isInfinite(): Boolean = _value.isInfinite() fun isFinite(): Boolean = _value.isFinite() - fun absoluteValue(): Duration = if (isNegative()) -this else this + val absoluteValue: Duration get() = if (isNegative()) -this else this override fun compareTo(other: Duration): Int = this._value.compareTo(other._value) @@ -111,7 +111,7 @@ public inline class Duration internal constructor(internal val _value: Double) : if (isInfinite()) { append(_value) } else { - val absNs = absoluteValue().inNanoseconds + val absNs = absoluteValue.inNanoseconds var scientific = false var maxDecimals = 0 val unit = when { @@ -153,7 +153,7 @@ public inline class Duration internal constructor(internal val _value: Double) : fun toIsoString(): String = buildString { if (isNegative()) append('-') append('P') - absoluteValue().toComponents { days, hours, minutes, seconds, nanoseconds -> + absoluteValue.toComponents { days, hours, minutes, seconds, nanoseconds -> if (days != 0) append(days).append('D') diff --git a/libraries/stdlib/test/time/DurationTest.kt b/libraries/stdlib/test/time/DurationTest.kt index c3c1bb9158f..df4df30a558 100644 --- a/libraries/stdlib/test/time/DurationTest.kt +++ b/libraries/stdlib/test/time/DurationTest.kt @@ -207,9 +207,9 @@ class DurationTest { assertFalse(zero.isNegative()) assertFalse(positive.isNegative()) - assertEquals(positive, negative.absoluteValue()) - assertEquals(positive, positive.absoluteValue()) - assertEquals(zero, zero.absoluteValue()) + assertEquals(positive, negative.absoluteValue) + assertEquals(positive, positive.absoluteValue) + assertEquals(zero, zero.absoluteValue) }