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

Fixes #8100 (#8101)

Browse source
This commit is contained in:
Oscar Nihlgård 2018-06-29 14:53:09 +02:00 • committed by Andreas Rumpf
commit 7674df0dff
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/strformat.nim
View file

@ -258,7 +258,9 @@ template callFormat(res, arg) {.dirty.} =
# workaround in order to circumvent 'strutils.format' which matches # workaround in order to circumvent 'strutils.format' which matches
# too but doesn't adhere to our protocol. # too but doesn't adhere to our protocol.
res.add arg res.add arg
elif compiles(format(arg, res)): elif compiles(format(arg, res)) and
# Check if format returns void
not (compiles do: discard format(arg, res)):
format(arg, res) format(arg, res)
elif compiles(format(arg)): elif compiles(format(arg)):
res.add format(arg) res.add format(arg)
@ -684,6 +686,9 @@ when isMainModule:
var nullTime: DateTime var nullTime: DateTime
check &"{nullTime:yyyy-mm-dd}", "0000-00-00" check &"{nullTime:yyyy-mm-dd}", "0000-00-00"
var tm = fromUnix(0)
discard &"{tm}"
# Unicode string tests # Unicode string tests
check &"""{"αβγ"}""", "αβγ" check &"""{"αβγ"}""", "αβγ"
check &"""{"αβγ":>5}""", " αβγ" check &"""{"αβγ":>5}""", " αβγ"