jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unexport times.stringifyUnit (#8168)

Browse source
This commit is contained in:
Oscar Nihlgård 2018-07-01 12:54:13 +02:00 • committed by Andreas Rumpf
commit b61e69202b
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pure/times.nim
View file

@ -489,18 +489,16 @@ proc toParts*(dur: Duration): DurationParts =
result[unit] = quantity result[unit] = quantity
proc stringifyUnit*(value: int | int64, unit: string): string = proc stringifyUnit(value: int | int64, unit: TimeUnit): string =
## Stringify time unit with it's name, lowercased ## Stringify time unit with it's name, lowercased
runnableExamples: let strUnit = $unit
doAssert stringifyUnit(2, "Seconds") == "2 seconds"
doAssert stringifyUnit(1, "Years") == "1 year"
result = "" result = ""
result.add($value) result.add($value)
result.add(" ") result.add(" ")
if abs(value) != 1: if abs(value) != 1:
result.add(unit.toLowerAscii()) result.add(strUnit.toLowerAscii())
else: else:
result.add(unit[0..^2].toLowerAscii()) result.add(strUnit[0..^2].toLowerAscii())
proc humanizeParts(parts: seq[string]): string = proc humanizeParts(parts: seq[string]): string =
## Make date string parts human-readable ## Make date string parts human-readable
@ -530,7 +528,7 @@ proc `$`*(dur: Duration): string =
for unit in countdown(Weeks, Nanoseconds): for unit in countdown(Weeks, Nanoseconds):
let quantity = numParts[unit] let quantity = numParts[unit]
if quantity != 0.int64: if quantity != 0.int64:
parts.add(stringifyUnit(quantity, $unit)) parts.add(stringifyUnit(quantity, unit))
result = humanizeParts(parts) result = humanizeParts(parts)
@ -1024,7 +1022,7 @@ proc `$`*(ti: TimeInterval): string =
var tiParts = toParts(ti) var tiParts = toParts(ti)
for unit in countdown(Years, Nanoseconds): for unit in countdown(Years, Nanoseconds):
if tiParts[unit] != 0: if tiParts[unit] != 0:
parts.add(stringifyUnit(tiParts[unit], $unit)) parts.add(stringifyUnit(tiParts[unit], unit))
result = humanizeParts(parts) result = humanizeParts(parts)