mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.format: Change formatting of nil values to avoid looking like XML

Browse source
This commit is contained in:
Kim Alvefur 2021-06-29 16:18:31 +02:00
parent bfb4514d0f
commit 6e037dc045
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/util_format_spec.lua
View file

@ -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));

4
util/format.lua
View file

@ -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