diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-01-08 13:43:43 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-01-08 13:43:43 +0100 |
| commit | b168efd1ab06422d147b1938aed6e0ed19e6134f (patch) | |
| tree | 2c98ae94058f244a08646cc14005ed543aefb00d /lib/pure/strformat.nim | |
| parent | e23ea64c41e101d4e1d933f0b015f51cc6c2f7de (diff) | |
| download | Nim-b168efd1ab06422d147b1938aed6e0ed19e6134f.tar.gz | |
make strformat.fmt take the same signature as strfmt.fmt in order to force an ambiguity error; refs #6958
Diffstat (limited to 'lib/pure/strformat.nim')
| -rw-r--r-- | lib/pure/strformat.nim | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pure/strformat.nim b/lib/pure/strformat.nim index 180cbcbec..e04c80794 100644 --- a/lib/pure/strformat.nim +++ b/lib/pure/strformat.nim @@ -224,7 +224,7 @@ template callFormatOption(res, arg, option) {.dirty.} = else: res.add format(arg, option) -macro fmt*(pattern: string): untyped = +macro fmt*(pattern: string{lit}): untyped = ## For a specification of the ``fmt`` macro, see the module level documentation. runnableExamples: template check(actual, expected: string) = @@ -332,7 +332,7 @@ macro fmt*(pattern: string): untyped = # works: import times - var nullTime: TimeInfo + var nullTime: DateTime check fmt"{nullTime:yyyy-mm-dd}", "0000-00-00" # Unicode string tests @@ -609,7 +609,6 @@ proc format*(value: string; specifier: string; res: var string) = ## sense to call this directly, but it is required to exist ## by the ``fmt`` macro. let spec = parseStandardFormatSpecifier(specifier) - var fmode = ffDefault case spec.typ of 's', '\0': discard else: |