From a8a38f346548f507f06ff07d790d87913007523f Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@cepl.eu>
Date: Thu, 17 Jan 2019 15:58:05 +0100
Subject: test: Lua 5.2/5.3 compat

close #9515
ref #9280
---
 test/functional/helpers.lua | 1 -
 test/helpers.lua            | 1 +
 test/unit/api/helpers.lua   | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 851f3e720e..ec5c83fa92 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,4 +1,3 @@
-require('vim.compat')
 require('coxpcall')
 local luv = require('luv')
 local lfs = require('lfs')
diff --git a/test/helpers.lua b/test/helpers.lua
index a6ed312213..59da274e87 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -1,3 +1,4 @@
+require('vim.compat')
 local assert = require('luassert')
 local luv = require('luv')
 local lfs = require('lfs')
diff --git a/test/unit/api/helpers.lua b/test/unit/api/helpers.lua
index 4fb1cee4b3..3d306d2b1b 100644
--- a/test/unit/api/helpers.lua
+++ b/test/unit/api/helpers.lua
@@ -114,8 +114,7 @@ local lua2obj_type_tab = {
                      api.xmalloc(len * ffi.sizeof('KeyValuePair'))),
     }})
     for i = 1, len do
-      local table_unpack = table.unpack or unpack  -- luacheck: compat
-      local key, val = table_unpack(kvs[i])
+      local key, val = unpack(kvs[i])
       dct.data.dictionary.items[i - 1] = ffi.new(
           'KeyValuePair', {key=ffi.gc(lua2obj(key), nil).data.string,
                            value=ffi.gc(lua2obj(val), nil)})
-- 
cgit