Merge 0.10->trunk

3 files changed, 5 insertions, 3 deletions

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 14dd4360..e3a83817 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -16,7 +16,8 @@ local math_max, rep = math.max, string.rep;
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 local tostring = tostring;
-local select, unpack = select, table.unpack or unpack;
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
 
 local config = require "core.configmanager";
 local logger = require "util.logger";
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 14e5771b..8db5c218 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -23,7 +23,7 @@ local ipairs, pairs, select = ipairs, pairs, select;
 local tonumber, tostring = tonumber, tostring;
 local require = require;
 local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
-local unpack = table.unpack or unpack; -- renamed in 5.2
+local unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
 
 local prosody = prosody;
 local hosts = prosody.hosts;
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 41c9b2fe..65542f9a 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -23,7 +23,8 @@ local setmetatable, rawget = setmetatable, rawget;
 local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
 
 local debug_traceback = debug.traceback;
-local unpack, select = unpack, select;
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
 local pcall = function(f, ...)
 	local n = select("#", ...);
 	local params = {...};