From 5251c9b686fc7885c1213cc2580d66ebda2dda9b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 11 Jul 2022 19:07:38 +0200
Subject: compat: Remove handling of Lua 5.1 location of 'unpack' function

---
 util/format.lua      | 2 +-
 util/human/units.lua | 2 +-
 util/import.lua      | 2 +-
 util/iterators.lua   | 2 +-
 util/multitable.lua  | 2 +-
 util/openmetrics.lua | 2 +-
 util/promise.lua     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/format.lua b/util/format.lua
index 611068d7..35694271 100644
--- a/util/format.lua
+++ b/util/format.lua
@@ -6,7 +6,7 @@
 -- Provides some protection from e.g. CAPEC-135, CWE-117, CWE-134, CWE-93
 
 local tostring = tostring;
-local unpack = table.unpack or unpack; -- luacheck: ignore 113/unpack
+local unpack = table.unpack;
 local pack = require "util.table".pack; -- TODO table.pack in 5.2+
 local valid_utf8 = require "util.encodings".utf8.valid;
 local type = type;
diff --git a/util/human/units.lua b/util/human/units.lua
index 23e3e579..329c8518 100644
--- a/util/human/units.lua
+++ b/util/human/units.lua
@@ -4,7 +4,7 @@ local math_floor = math.floor;
 local math_log = math.log;
 local math_max = math.max;
 local math_min = math.min;
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local unpack = table.unpack;
 
 local large = {
 	"k", 1000,
diff --git a/util/import.lua b/util/import.lua
index 1007bc0a..0892e9b1 100644
--- a/util/import.lua
+++ b/util/import.lua
@@ -8,7 +8,7 @@
 
 
 
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local unpack = table.unpack;
 local t_insert = table.insert;
 function _G.import(module, ...)
 	local m = package.loaded[module] or require(module);
diff --git a/util/iterators.lua b/util/iterators.lua
index c03c2fd6..e9f7c1b2 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -12,7 +12,7 @@ local it = {};
 
 local t_insert = table.insert;
 local next = next;
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local unpack = table.unpack;
 local pack = table.pack or require "util.table".pack;
 local type = type;
 local table, setmetatable = table, setmetatable;
diff --git a/util/multitable.lua b/util/multitable.lua
index 4f2cd972..0c292b45 100644
--- a/util/multitable.lua
+++ b/util/multitable.lua
@@ -9,7 +9,7 @@
 local select = select;
 local t_insert = table.insert;
 local pairs, next, type = pairs, next, type;
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local unpack = table.unpack;
 
 local _ENV = nil;
 -- luacheck: std none
diff --git a/util/openmetrics.lua b/util/openmetrics.lua
index 634f9de1..f451e504 100644
--- a/util/openmetrics.lua
+++ b/util/openmetrics.lua
@@ -26,7 +26,7 @@ local log = require "util.logger".init("util.openmetrics");
 local new_multitable = require "util.multitable".new;
 local iter_multitable = require "util.multitable".iter;
 local t_concat, t_insert = table.concat, table.insert;
-local t_pack, t_unpack = require "util.table".pack, table.unpack or unpack; --luacheck: ignore 113/unpack
+local t_pack, t_unpack = require "util.table".pack, table.unpack;
 
 -- BEGIN of Utility: "metric proxy"
 -- This allows to wrap a MetricFamily in a proxy which only provides the
diff --git a/util/promise.lua b/util/promise.lua
index c4e166ed..1762d501 100644
--- a/util/promise.lua
+++ b/util/promise.lua
@@ -2,7 +2,7 @@ local promise_methods = {};
 local promise_mt = { __name = "promise", __index = promise_methods };
 
 local xpcall = require "util.xpcall".xpcall;
-local unpack = table.unpack or unpack; --luacheck: ignore 113
+local unpack = table.unpack;
 
 function promise_mt:__tostring()
 	return  "promise (" .. (self._state or "invalid") .. ")";
-- 
cgit v1.2.3