azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded buildString from Duration.toString

Browse Source
This commit is contained in:
Ilya Gorbunov
2019-06-05 23:20:02 +03:00
parent 155dfeaf35
commit ffd9d8c71d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+5 -6
View File
@@ -114,15 +114,14 @@ public inline class Duration internal constructor(internal val value: Double) :
public fun toLongNanoseconds(): Long = toLong(DurationUnit.NANOSECONDS) public fun toLongNanoseconds(): Long = toLong(DurationUnit.NANOSECONDS)
public fun toLongMilliseconds(): Long = toLong(DurationUnit.MILLISECONDS) public fun toLongMilliseconds(): Long = toLong(DurationUnit.MILLISECONDS)
override fun toString(): String = buildString { override fun toString(): String = when {
if (isInfinite()) { isInfinite() -> value.toString()
append(value) value == 0.0 -> "0s"
} else { else -> {
val absNs = absoluteValue.inNanoseconds val absNs = absoluteValue.inNanoseconds
var scientific = false var scientific = false
var maxDecimals = 0 var maxDecimals = 0
val unit = when { val unit = when {
absNs == 0.0 -> return "0s"
absNs < 1e-6 -> DurationUnit.SECONDS.also { scientific = true } absNs < 1e-6 -> DurationUnit.SECONDS.also { scientific = true }
absNs < 1 -> DurationUnit.NANOSECONDS.also { maxDecimals = 7 } absNs < 1 -> DurationUnit.NANOSECONDS.also { maxDecimals = 7 }
absNs < 1e3 -> DurationUnit.NANOSECONDS absNs < 1e3 -> DurationUnit.NANOSECONDS
@@ -135,7 +134,7 @@ public inline class Duration internal constructor(internal val value: Double) :
else -> DurationUnit.DAYS.also { scientific = true } else -> DurationUnit.DAYS.also { scientific = true }
} }
val value = toDouble(unit) val value = toDouble(unit)
return when { when {
scientific -> formatScientific(value) scientific -> formatScientific(value)
maxDecimals > 0 -> formatUpToDecimals(value, maxDecimals) maxDecimals > 0 -> formatUpToDecimals(value, maxDecimals)
else -> formatToExactDecimals(value, precision(abs(value))) else -> formatToExactDecimals(value, precision(abs(value)))