diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2020-01-21 16:49:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 16:49:59 +0100 |
| commit | bdb7c82c6aaf60392285cfea43c65c5b9b919e27 (patch) | |
| tree | 6e5e18499e11b354aff9d9d382d77587fc746232 /lib/pure | |
| parent | b355ef2a72086126e21187303f1d2d158f52f6a8 (diff) | |
| download | Nim-bdb7c82c6aaf60392285cfea43c65c5b9b919e27.tar.gz | |
fixes a critical times.nim bug reported on IRC [backport] (#13216)
Diffstat (limited to 'lib/pure')
| -rw-r--r-- | lib/pure/strformat.nim | 3 | ||||
| -rw-r--r-- | lib/pure/times.nim | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/pure/strformat.nim b/lib/pure/strformat.nim index ccbf6673e..bc0d4b069 100644 --- a/lib/pure/strformat.nim +++ b/lib/pure/strformat.nim @@ -717,6 +717,9 @@ when isMainModule: var tm = fromUnix(0) discard &"{tm}" + var noww = now() + check &"{noww}", $noww + # Unicode string tests check &"""{"αβγ"}""", "αβγ" check &"""{"αβγ":>5}""", " αβγ" diff --git a/lib/pure/times.nim b/lib/pure/times.nim index 6c8ef46cc..a5846fabb 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -2339,9 +2339,10 @@ proc format*(dt: DateTime, f: static[string]): string {.raises: [].} = const f2 = initTimeFormat(f) result = dt.format(f2) -template formatValue*(result: var string; value: DateTime, specifier: string) = +proc formatValue*(result: var string; value: DateTime, specifier: string) = ## adapter for strformat. Not intended to be called directly. - result.add format(value, specifier) + result.add format(value, + if specifier.len == 0: "yyyy-MM-dd'T'HH:mm:sszzz" else: specifier) proc format*(time: Time, f: string, zone: Timezone = local()): string {.raises: [TimeFormatParseError].} = |