Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 15:00:17 +0100
changeset 7167 af26e8eb591f
parent 7164 8380b595a33b (current diff)
parent 7166 eadbf19d0de0 (diff)
child 7169 d843b7911d47
Merge 0.10->trunk
core/moduleapi.lua
--- a/core/loggingmanager.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/loggingmanager.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -16,7 +16,8 @@
 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";
--- a/core/moduleapi.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/moduleapi.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -23,7 +23,7 @@
 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;
--- a/core/modulemanager.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/modulemanager.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -23,7 +23,8 @@
 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 = {...};