Merge remote-tracking branch 'upstream/master' into userreg

1 files changed, 8 insertions, 10 deletions

diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua
index 131661828e..a48c408600 100644
--- a/test/functional/ex_cmds/file_spec.lua
+++ b/test/functional/ex_cmds/file_spec.lua
@@ -1,14 +1,13 @@
 local helpers = require('test.functional.helpers')(after_each)
-local luv = require('luv')
 local clear = helpers.clear
 local command = helpers.command
 local eq = helpers.eq
-local funcs = helpers.funcs
+local fn = helpers.fn
 local rmdir = helpers.rmdir
 local mkdir = helpers.mkdir
 
 describe(':file', function()
-  local swapdir = luv.cwd()..'/Xtest-file_spec'
+  local swapdir = vim.uv.cwd() .. '/Xtest-file_spec'
   before_each(function()
     clear()
     rmdir(swapdir)
@@ -19,18 +18,17 @@ describe(':file', function()
     rmdir(swapdir)
   end)
 
-  it("rename does not lose swapfile #6487", function()
+  it('rename does not lose swapfile #6487', function()
     local testfile = 'test-file_spec'
-    local testfile_renamed = testfile..'-renamed'
+    local testfile_renamed = testfile .. '-renamed'
     -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
     -- attempt to create a swapfile in different directory.
-    command('set directory^='..swapdir..'//')
+    command('set directory^=' .. swapdir .. '//')
     command('set swapfile fileformat=unix undolevels=-1')
 
-    command('edit! '..testfile)
+    command('edit! ' .. testfile)
     -- Before #6487 this gave "E301: Oops, lost the swap file !!!" on Windows.
-    command('file '..testfile_renamed)
-    eq(testfile_renamed..'.swp',
-       string.match(funcs.execute('swapname'), '[^%%]+$'))
+    command('file ' .. testfile_renamed)
+    eq(testfile_renamed .. '.swp', string.match(fn.execute('swapname'), '[^%%]+$'))
   end)
 end)