diff options
| author | Kim Alvefur <zash@zash.se> | 2021-06-29 16:18:31 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2021-06-29 16:18:31 +0200 |
| commit | 6e037dc0453639c0c56c06f51ddafca051b1e925 (patch) | |
| tree | 3bbcd05e8cf24bbfe0be79d37cbf07c78707b10c | |
| parent | bfb4514d0fc0aeaacf9f5fb741d67fd36bd2774a (diff) | |
| download | prosody-6e037dc0453639c0c56c06f51ddafca051b1e925.tar.gz prosody-6e037dc0453639c0c56c06f51ddafca051b1e925.zip | |
util.format: Change formatting of nil values to avoid looking like XML
| -rw-r--r-- | spec/util_format_spec.lua | 8 | ||||
| -rw-r--r-- | util/format.lua | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/util_format_spec.lua b/spec/util_format_spec.lua index a8bcfd97..d58c25aa 100644 --- a/spec/util_format_spec.lua +++ b/spec/util_format_spec.lua @@ -4,10 +4,10 @@ describe("util.format", function() describe("#format()", function() it("should work", function() assert.equal("hello", format("%s", "hello")); - assert.equal("<nil>", format("%s")); - assert.equal("<nil>", format("%d")); - assert.equal("<nil>", format("%q")); - assert.equal(" [<nil>]", format("", nil)); + assert.equal("(nil)", format("%s")); + assert.equal("(nil)", format("%d")); + assert.equal("(nil)", format("%q")); + assert.equal(" [(nil)]", format("", nil)); assert.equal("true", format("%s", true)); assert.equal("[true]", format("%d", true)); assert.equal("% [true]", format("%%", true)); diff --git a/util/format.lua b/util/format.lua index d9d771ea..72f909b8 100644 --- a/util/format.lua +++ b/util/format.lua @@ -55,7 +55,7 @@ local function format(formatstring, ...) local option = spec:sub(-1); if arg == nil then args[i] = "nil"; - spec = "<%s>"; + spec = "(%s)"; elseif option == "q" then args[i] = dump(arg); spec = "%s"; @@ -77,7 +77,7 @@ local function format(formatstring, ...) i = i + 1; local arg = args[i]; if arg == nil then - args[i] = "<nil>"; + args[i] = "(nil)"; else args[i] = tostring(arg); end |