Teal: convert luarocks.core.persist

1 files changed, 17 insertions, 27 deletions

diff --git a/src/luarocks/core/persist.lua b/src/luarocks/core/persist.tl
index 57e7b5d4..89cac97e 100644
--- a/src/luarocks/core/persist.lua
+++ b/src/luarocks/core/persist.tl
@@ -1,7 +1,7 @@
 
-local persist = {}
+local record persist
+end
 
-local require = nil
 --------------------------------------------------------------------------------
 
 --- Load and run a Lua file in an environment.
@@ -10,35 +10,27 @@ local require = nil
 -- @return (true, any) or (nil, string, string): true and the return value
 -- of the file, or nil, an error message and an error code ("open", "load"
 -- or "run") in case of errors.
-function persist.run_file(filename, env)
-   local fd, err = io.open(filename)
+function persist.run_file(filename: string, env: {string:any}): boolean, any | string, string
+   local fd, open_err: FILE, any = io.open(filename)
    if not fd then
-      return nil, err, "open"
+      return nil, open_err, "open"
    end
-   local str, err = fd:read("*a")
+   local str, read_err: string, string = fd:read("*a")
    fd:close()
    if not str then
-      return nil, err, "open"
+      return nil, read_err, "open"
    end
    str = str:gsub("^#![^\n]*\n", "")
-   local chunk, ran
-   if _VERSION == "Lua 5.1" then -- Lua 5.1
-      chunk, err = loadstring(str, filename)
-      if chunk then
-         setfenv(chunk, env)
-         ran, err = pcall(chunk)
-      end
-   else -- Lua 5.2
-      chunk, err = load(str, filename, "t", env)
-      if chunk then
-         ran, err = pcall(chunk)
-      end
+   local chunk, ran, err: function(...: any):(any), boolean, any
+   chunk, err = load(str, filename, "t", env)
+   if chunk then
+      ran, err = pcall(chunk)
    end
    if not chunk then
-      return nil, "Error loading file: "..err, "load"
+      return nil, "Error loading file: "..tostring(err), "load"
    end
    if not ran then
-      return nil, "Error running file: "..err, "run"
+      return nil, "Error running file: "..tostring(err), "run"
    end
    return true, err
 end
@@ -53,14 +45,12 @@ end
 -- or nil, an error message and an error code ("open"; couldn't open the file,
 -- "load"; compile-time error, or "run"; run-time error)
 -- in case of errors.
-function persist.load_into_table(filename, tbl)
-   assert(type(filename) == "string")
-   assert(type(tbl) == "table" or not tbl)
+function persist.load_into_table(filename: string, tbl?: {string:any}) : {any: any}, {any: any} | string, string
 
-   local result = tbl or {}
+   local result: {string:any} = tbl or {}
    local globals = {}
    local globals_mt = {
-      __index = function(t, k)
+      __index = function(_, k: string)
          globals[k] = true
       end
    }
@@ -72,7 +62,7 @@ function persist.load_into_table(filename, tbl)
    setmetatable(result, save_mt)
 
    if not ok then
-      return nil, err, errcode
+      return nil, tostring(err), errcode 
    end
    return result, globals
 end