# HG changeset patch # User Kim Alvefur # Date 1687015064 -7200 # Node ID f43d04653bcf0db76f5a1882a4ba824a8e66c839 # Parent 6140aa67c61835005a65fdf7aabd676b714c240d util.jsonschema: Silence Teal warnings about utf8 library Teal worries that we redefine the global. Also that the fallback was missing type information. diff -r 6140aa67c618 -r f43d04653bcf teal-src/prosody/util/jsonschema.tl --- a/teal-src/prosody/util/jsonschema.tl Sat Jun 17 17:12:54 2023 +0200 +++ b/teal-src/prosody/util/jsonschema.tl Sat Jun 17 17:17:44 2023 +0200 @@ -11,8 +11,8 @@ if not math.type then require "prosody.util.mathcompat" end -local utf8 = rawget(_G, "utf8") or require"prosody.util.encodings".utf8; -local utf8_len = utf8.len or function(s) +local utf8_enc = rawget(_G, "utf8") or require"prosody.util.encodings".utf8; +local utf8_len = utf8_enc.len or function(s : string) : integer local _, count = s:gsub("[%z\001-\127\194-\253][\128-\191]*", ""); return count; end; diff -r 6140aa67c618 -r f43d04653bcf util/jsonschema.lua --- a/util/jsonschema.lua Sat Jun 17 17:12:54 2023 +0200 +++ b/util/jsonschema.lua Sat Jun 17 17:17:44 2023 +0200 @@ -4,8 +4,8 @@ return type(n) == "number" and n % 1 == 0 and n <= 9007199254740992 and n >= -9007199254740992 and "integer" or "float"; end; -local utf8 = rawget(_G, "utf8") or require("prosody.util.encodings").utf8; -local utf8_len = utf8.len or function(s) +local utf8_enc = rawget(_G, "utf8") or require("prosody.util.encodings").utf8; +local utf8_len = utf8_enc.len or function(s) local _, count = s:gsub("[%z\001-\127\194-\253][\128-\191]*", ""); return count end;