regenerate all files

73 files changed, 79 insertions, 227 deletions

diff --git a/src/luarocks/admin/cmd/add.lua b/src/luarocks/admin/cmd/add.lua
index 29b9e705..e94e9018 100644
--- a/src/luarocks/admin/cmd/add.lua
+++ b/src/luarocks/admin/cmd/add.lua
@@ -17,7 +17,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function add.add_to_parser(parser)
    local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
 
diff --git a/src/luarocks/admin/cmd/make_manifest.lua b/src/luarocks/admin/cmd/make_manifest.lua
index d2be94bb..2fe13fe3 100644
--- a/src/luarocks/admin/cmd/make_manifest.lua
+++ b/src/luarocks/admin/cmd/make_manifest.lua
@@ -17,7 +17,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function make_manifest.add_to_parser(parser)
    local cmd = parser:command("make_manifest", "Compile a manifest file for a repository.", util.see_also())
 
diff --git a/src/luarocks/admin/cmd/refresh_cache.lua b/src/luarocks/admin/cmd/refresh_cache.lua
index 9565be45..cf63021e 100644
--- a/src/luarocks/admin/cmd/refresh_cache.lua
+++ b/src/luarocks/admin/cmd/refresh_cache.lua
@@ -12,7 +12,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function refresh_cache.add_to_parser(parser)
    local cmd = parser:command("refresh_cache", "Refresh local cache of a remote rocks server.", util.see_also())
 
diff --git a/src/luarocks/admin/cmd/remove.lua b/src/luarocks/admin/cmd/remove.lua
index 619a7354..a24cf76f 100644
--- a/src/luarocks/admin/cmd/remove.lua
+++ b/src/luarocks/admin/cmd/remove.lua
@@ -17,7 +17,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function admin_remove.add_to_parser(parser)
    local cmd = parser:command("remove", "Remove a rock or rockspec from a rocks server.", util.see_also())
 
diff --git a/src/luarocks/admin/index.lua b/src/luarocks/admin/index.lua
index 8fec0f6f..e2e2deff 100644
--- a/src/luarocks/admin/index.lua
+++ b/src/luarocks/admin/index.lua
@@ -14,7 +14,6 @@ local manif = require("luarocks.manif")
 
 
 
-
 local ext_url_target = ' target="_blank"'
 
 local index_header = [[
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 853b0318..2074218e 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -13,8 +13,6 @@ local builtin = {}
 
 
 
-
-
 builtin.skip_lua_inc_lib_check = true
 
 local dir_sep = package.config:sub(1, 1)
@@ -104,7 +102,7 @@ do
       if bindir then
          install = { bin = {} }
          for _, file in ipairs(fs.list_dir(bindir)) do
-            table.insert(install.bin, dir.path(bindir, file))
+            table.insert((install.bin), dir.path(bindir, file))
          end
       end
 
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index ea245444..aae99487 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -15,8 +15,6 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-
-
 function cmake.run(rockspec, no_install)
    local build = rockspec.build
    local variables = build.variables or {}
diff --git a/src/luarocks/build/command.lua b/src/luarocks/build/command.lua
index 181bc56b..8a1de8e2 100644
--- a/src/luarocks/build/command.lua
+++ b/src/luarocks/build/command.lua
@@ -15,8 +15,6 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-
-
 function command.run(rockspec, not_install)
 
    local build = rockspec.build
diff --git a/src/luarocks/build/make.lua b/src/luarocks/build/make.lua
index 6601c637..5fbc61c4 100644
--- a/src/luarocks/build/make.lua
+++ b/src/luarocks/build/make.lua
@@ -21,8 +21,6 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-
-
 local function make_pass(make_cmd, pass, target, variables)
    local assignments = {}
    for k, v in pairs(variables) do
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 3cf565bf..9db7a4cd 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -36,9 +36,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
 local hc_ok, hardcoded = pcall(require, "luarocks.core.hardcoded")
 if not hc_ok then
    hardcoded = {}
diff --git a/src/luarocks/cmd/build.lua b/src/luarocks/cmd/build.lua
index 6aa3afe0..b66efd72 100644
--- a/src/luarocks/cmd/build.lua
+++ b/src/luarocks/cmd/build.lua
@@ -28,8 +28,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
 function cmd_build.add_to_parser(parser)
    local cmd = parser:command("build", "Build and install a rock, compiling its C parts if any.\n" ..
    "If the sources contain a luarocks.lock file, uses it as an authoritative source for " ..
diff --git a/src/luarocks/cmd/config.lua b/src/luarocks/cmd/config.lua
index c2dd7d82..e4f4cf88 100644
--- a/src/luarocks/cmd/config.lua
+++ b/src/luarocks/cmd/config.lua
@@ -19,7 +19,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function config_cmd.add_to_parser(parser)
    local cmd = parser:command("config", [[
 Query information about the LuaRocks configuration.
diff --git a/src/luarocks/cmd/doc.lua b/src/luarocks/cmd/doc.lua
index 52846337..9ec27aad 100644
--- a/src/luarocks/cmd/doc.lua
+++ b/src/luarocks/cmd/doc.lua
@@ -18,7 +18,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function doc.add_to_parser(parser)
    local cmd = parser:command("doc", "Show documentation for an installed rock.\n\n" ..
    "Without any flags, tries to load the documentation using a series of heuristics.\n" ..
diff --git a/src/luarocks/cmd/download.lua b/src/luarocks/cmd/download.lua
index 9ae2fa27..62f071e1 100644
--- a/src/luarocks/cmd/download.lua
+++ b/src/luarocks/cmd/download.lua
@@ -12,7 +12,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function cmd_download.add_to_parser(parser)
    local cmd = parser:command("download", "Download a specific rock file from a rocks server.", util.see_also())
 
diff --git a/src/luarocks/cmd/init.lua b/src/luarocks/cmd/init.lua
index 4e1765a1..4eb47629 100644
--- a/src/luarocks/cmd/init.lua
+++ b/src/luarocks/cmd/init.lua
@@ -22,9 +22,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
 function init.add_to_parser(parser)
    local cmd = parser:command("init", "Initialize a directory for a Lua project using LuaRocks.", util.see_also())
 
diff --git a/src/luarocks/cmd/install.lua b/src/luarocks/cmd/install.lua
index 11e36b8c..d5f62a89 100644
--- a/src/luarocks/cmd/install.lua
+++ b/src/luarocks/cmd/install.lua
@@ -25,8 +25,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
 function install.add_to_parser(parser)
    local cmd = parser:command("install", "Install a rock.", util.see_also())
 
diff --git a/src/luarocks/cmd/lint.lua b/src/luarocks/cmd/lint.lua
index cfff66c0..6c064645 100644
--- a/src/luarocks/cmd/lint.lua
+++ b/src/luarocks/cmd/lint.lua
@@ -13,7 +13,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function lint.add_to_parser(parser)
    local cmd = parser:command("lint", "Check syntax of a rockspec.\n\n" ..
    "Returns success if the text of the rockspec is syntactically correct, else failure.",
diff --git a/src/luarocks/cmd/list.lua b/src/luarocks/cmd/list.lua
index 96a95bc3..bfd985bc 100644
--- a/src/luarocks/cmd/list.lua
+++ b/src/luarocks/cmd/list.lua
@@ -28,9 +28,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
 function list.add_to_parser(parser)
    local cmd = parser:command("list", "List currently installed rocks.", util.see_also())
 
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua
index f373c94e..5855bef2 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -24,8 +24,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
 function make.cmd_options(parser)
    parser:flag("--no-install", "Do not install the rock.")
    parser:flag("--no-doc", "Install the rock without its documentation.")
diff --git a/src/luarocks/cmd/new_version.lua b/src/luarocks/cmd/new_version.lua
index 33b98801..9e5508dd 100644
--- a/src/luarocks/cmd/new_version.lua
+++ b/src/luarocks/cmd/new_version.lua
@@ -21,9 +21,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
 function new_version.add_to_parser(parser)
    local cmd = parser:command("new_version", [[
 This is a utility function that writes a new rockspec, updating data from a
diff --git a/src/luarocks/cmd/pack.lua b/src/luarocks/cmd/pack.lua
index 88268a0a..c5342d8e 100644
--- a/src/luarocks/cmd/pack.lua
+++ b/src/luarocks/cmd/pack.lua
@@ -13,7 +13,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function cmd_pack.add_to_parser(parser)
    local cmd = parser:command("pack", "Create a rock, packing sources or binaries.", util.see_also())
 
diff --git a/src/luarocks/cmd/path.lua b/src/luarocks/cmd/path.lua
index 78c1a1ec..5f54d5f7 100644
--- a/src/luarocks/cmd/path.lua
+++ b/src/luarocks/cmd/path.lua
@@ -13,7 +13,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function path_cmd.add_to_parser(parser)
    local cmd = parser:command("path", [[
 Returns the package path currently configured for this installation
diff --git a/src/luarocks/cmd/purge.lua b/src/luarocks/cmd/purge.lua
index 167587f0..c2c26e67 100644
--- a/src/luarocks/cmd/purge.lua
+++ b/src/luarocks/cmd/purge.lua
@@ -20,7 +20,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function purge.add_to_parser(parser)
 
    local cmd = parser:command("purge", [[
diff --git a/src/luarocks/cmd/remove.lua b/src/luarocks/cmd/remove.lua
index c62610d4..2afededc 100644
--- a/src/luarocks/cmd/remove.lua
+++ b/src/luarocks/cmd/remove.lua
@@ -18,7 +18,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function cmd_remove.add_to_parser(parser)
 
    local cmd = parser:command("remove", [[
diff --git a/src/luarocks/cmd/search.lua b/src/luarocks/cmd/search.lua
index a7569c27..b16a0eef 100644
--- a/src/luarocks/cmd/search.lua
+++ b/src/luarocks/cmd/search.lua
@@ -17,8 +17,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
 function cmd_search.add_to_parser(parser)
    local cmd = parser:command("search", "Query the LuaRocks servers.", util.see_also())
 
diff --git a/src/luarocks/cmd/show.lua b/src/luarocks/cmd/show.lua
index 0ae5cbc6..08d86663 100644
--- a/src/luarocks/cmd/show.lua
+++ b/src/luarocks/cmd/show.lua
@@ -36,9 +36,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
 function show.add_to_parser(parser)
    local cmd = parser:command("show", [[
 Show information about an installed rock.
diff --git a/src/luarocks/cmd/test.lua b/src/luarocks/cmd/test.lua
index 22e91366..a467eb36 100644
--- a/src/luarocks/cmd/test.lua
+++ b/src/luarocks/cmd/test.lua
@@ -12,7 +12,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function cmd_test.add_to_parser(parser)
    local cmd = parser:command("test", [[
 Run the test suite for the Lua project in the current directory.
diff --git a/src/luarocks/cmd/unpack.lua b/src/luarocks/cmd/unpack.lua
index 1ed9a2f5..62a5c7f0 100644
--- a/src/luarocks/cmd/unpack.lua
+++ b/src/luarocks/cmd/unpack.lua
@@ -18,8 +18,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
 function unpack.add_to_parser(parser)
    local cmd = parser:command("unpack", [[
 Unpacks the contents of a rock in a newly created directory.
diff --git a/src/luarocks/cmd/upload.lua b/src/luarocks/cmd/upload.lua
index 576fdc65..0566b8c4 100644
--- a/src/luarocks/cmd/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -25,7 +25,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
 function upload.add_to_parser(parser)
    local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) " ..
    "and upload it and the rockspec to the public rocks repository.", util.see_also()):
diff --git a/src/luarocks/cmd/which.lua b/src/luarocks/cmd/which.lua
index f50a43c3..a48596ce 100644
--- a/src/luarocks/cmd/which.lua
+++ b/src/luarocks/cmd/which.lua
@@ -1,24 +1,30 @@
 
---- @module luarocks.which_cmd
--- Driver for the `luarocks which` command.
+
+
 local which_cmd = {}
 
+
 local loader = require("luarocks.loader")
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
 function which_cmd.add_to_parser(parser)
-   local cmd = parser:command("which", 'Given a module name like "foo.bar", '..
-      "output which file would be loaded to resolve that module by "..
-      'luarocks.loader, like "/usr/local/lua/'..cfg.lua_version..'/foo/bar.lua".',
-      util.see_also())
-      :summary("Tell which file corresponds to a given module name.")
+   local cmd = parser:command("which", 'Given a module name like "foo.bar", ' ..
+   "output which file would be loaded to resolve that module by " ..
+   'luarocks.loader, like "/usr/local/lua/' .. cfg.lua_version .. '/foo/bar.lua".',
+   util.see_also()):
+   summary("Tell which file corresponds to a given module name.")
 
    cmd:argument("modname", "Module name.")
 end
 
---- Driver function for "which" command.
--- @return boolean This function terminates the interpreter.
+
+
 function which_cmd.command(args)
    local pathname, rock_name, rock_version, where = loader.which(args.modname, "lp")
 
@@ -28,7 +34,7 @@ function which_cmd.command(args)
          util.printout("(provided by " .. tostring(rock_name) .. " " .. tostring(rock_version) .. ")")
       else
          local key = rock_name
-         util.printout("(found directly via package." .. key.. " -- not installed as a rock?)")
+         util.printout("(found directly via package." .. key .. " -- not installed as a rock?)")
       end
       return true
    end
@@ -37,4 +43,3 @@ function which_cmd.command(args)
 end
 
 return which_cmd
-
diff --git a/src/luarocks/cmd/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index 41777307..5ec26003 100644
--- a/src/luarocks/cmd/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -25,10 +25,6 @@ local argparse = require("luarocks.vendor.argparse")
 
 
 
-
-
-
-
 local lua_versions = {
    "5.1",
    "5.2",
diff --git a/src/luarocks/core/dir.lua b/src/luarocks/core/dir.lua
index 7d9702ba..b9b71c14 100644
--- a/src/luarocks/core/dir.lua
+++ b/src/luarocks/core/dir.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local package = _tl_compat and _tl_compat.package or package; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local dir = {}
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local package = _tl_compat and _tl_compat.package or package; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local dir = {}
 
 
 
@@ -19,7 +19,6 @@ end
 
 
 function dir.split_url(url)
-   assert(type(url) == "string")
 
    url = unquote(url)
    local protocol, pathname = url:match("^([^:]*)://(.*)")
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua
index 197b4725..11a6cf41 100644
--- a/src/luarocks/core/manif.lua
+++ b/src/luarocks/core/manif.lua
@@ -1,4 +1,7 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table
+
+local manif = {}
+
 
 local persist = require("luarocks.core.persist")
 local cfg = require("luarocks.core.cfg")
@@ -10,27 +13,6 @@ local path = require("luarocks.core.path")
 
 
 
-local manif = {DependencyVersion = {}, Manifest = {}, Tree_manifest = {}, }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -85,7 +67,6 @@ end
 
 
 function manif.fast_load_local_manifest(repo_url)
-   assert(type(repo_url) == "string")
 
    local cached_manifest = manif.get_cached_manifest(repo_url)
    if cached_manifest then
diff --git a/src/luarocks/core/path.lua b/src/luarocks/core/path.lua
index c9bcfe5c..b88b3bfc 100644
--- a/src/luarocks/core/path.lua
+++ b/src/luarocks/core/path.lua
@@ -42,7 +42,6 @@ end
 
 
 function path.path_to_module(file)
-   assert(type(file) == "string")
 
    local exts = {}
    local paths = package.path .. ";" .. package.cpath
@@ -74,7 +73,6 @@ function path.deploy_lua_dir(tree)
    if type(tree) == "string" then
       return dir.path(tree, cfg.lua_modules_path)
    else
-      assert(type(tree) == "table")
       return tree.lua_dir or dir.path(tree.root, cfg.lua_modules_path)
    end
 end
@@ -83,7 +81,6 @@ function path.deploy_lib_dir(tree)
    if type(tree) == "string" then
       return dir.path(tree, cfg.lib_modules_path)
    else
-      assert(type(tree) == "table")
       return tree.lib_dir or dir.path(tree.root, cfg.lib_modules_path)
    end
 end
diff --git a/src/luarocks/core/sysdetect.lua b/src/luarocks/core/sysdetect.lua
index 40203808..3a2527f4 100644
--- a/src/luarocks/core/sysdetect.lua
+++ b/src/luarocks/core/sysdetect.lua
@@ -435,7 +435,6 @@ end
 
 
 function sysdetect.detect_file(file)
-   assert(type(file) == "string")
    local fd = io.open(file, "rb")
    if not fd then
       return nil
diff --git a/src/luarocks/core/types/query.lua b/src/luarocks/core/types/query.lua
index 885532a0..1fb42576 100644
--- a/src/luarocks/core/types/query.lua
+++ b/src/luarocks/core/types/query.lua
@@ -1,6 +1,5 @@
 
 
-
 local query = {Query = {}, }
 
 
diff --git a/src/luarocks/core/types/result.lua b/src/luarocks/core/types/result.lua
index d2812eec..6e05df9a 100644
--- a/src/luarocks/core/types/result.lua
+++ b/src/luarocks/core/types/result.lua
@@ -1,6 +1,5 @@
 
 
-
 local result = {Result = {}, }
 
 
diff --git a/src/luarocks/core/types/rockspec.lua b/src/luarocks/core/types/rockspec.lua
index d74dfa2a..18c6f485 100644
--- a/src/luarocks/core/types/rockspec.lua
+++ b/src/luarocks/core/types/rockspec.lua
@@ -2,8 +2,6 @@
 
 
 
-
-
 local rockspec = {Description = {}, Source = {}, Test = {}, Dependencies = {}, Hooks = {}, Deploy = {}, Rockspec = {}, }
 
 
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua
index 3be00136..6a457c54 100644
--- a/src/luarocks/core/util.lua
+++ b/src/luarocks/core/util.lua
@@ -7,7 +7,6 @@ local util = {}
 
 
 
-
 local dir_sep = package.config:sub(1, 1)
 
 
@@ -110,7 +109,7 @@ function util.show_table(t, tname, top_indent)
    end
 
    tname = tname or "__unnamed__"
-   if type(t) ~= "table" then
+   if not (type(t) == "table") then
       return tname .. " = " .. basic_serialize(t)
    end
    cart, autoref = "", ""
diff --git a/src/luarocks/core/vers.lua b/src/luarocks/core/vers.lua
index e7c4a221..413b11d6 100644
--- a/src/luarocks/core/vers.lua
+++ b/src/luarocks/core/vers.lua
@@ -6,7 +6,6 @@ local util = require("luarocks.core.util")
 
 
 
-
 local deltas = {
    dev = 120000000,
    scm = 110000000,
diff --git a/src/luarocks/deplocks.lua b/src/luarocks/deplocks.lua
index cfe61e53..8a21ef1b 100644
--- a/src/luarocks/deplocks.lua
+++ b/src/luarocks/deplocks.lua
@@ -7,7 +7,6 @@ local persist = require("luarocks.persist")
 
 
 
-
 local deptable = {}
 local deptable_mode = "start"
 local deplock_abs_filename
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index d4ca2322..a6103946 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -3,6 +3,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local deps = {}
 
 
+
 local cfg = require("luarocks.core.cfg")
 local manif = require("luarocks.manif")
 local path = require("luarocks.path")
@@ -53,8 +54,6 @@ local deplocks = require("luarocks.deplocks")
 
 
 
-
-
 local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set)
 
    return function(dep)
@@ -223,7 +222,6 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
    end
 
    local search = require("luarocks.search")
-   local install = require("luarocks.cmd.install")
 
    local url, search_err = search.find_suitable_rock(dep)
    if not url then
@@ -236,7 +234,7 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
       namespace = dep.namespace,
       verify = verify,
    }
-   local ok, install_err, errcode = install.command(install_args)
+   local ok, install_err, errcode = deps.installer(install_args)
    if not ok then
       return nil, "Failed installing dependency: " .. url .. " - " .. install_err, errcode
    end
@@ -591,13 +589,13 @@ end
 
 function deps.autodetect_external_dependencies(build)
 
-   if not build or not build.modules then
+   if not build or not (build).modules then
       return nil
    end
 
    local extdeps = {}
    local any = false
-   for _, data in pairs(build.modules) do
+   for _, data in pairs((build).modules) do
       if type(data) == "table" and data.libraries then
          local libraries
          local librariesstr = data.libraries
@@ -678,8 +676,6 @@ end
 
 
 function deps.scan_deps(results, mdeps, name, version, deps_mode)
-   assert(type(results) == "table")
-   assert(type(mdeps) == "table")
    assert(not name:match("/"))
 
    local fetch = require("luarocks.fetch")
@@ -722,7 +718,7 @@ local function lua_h_exists(d, luaver)
       local data = fd:read("*a")
       fd:close()
       if data:match("LUA_VERSION_NUM%s*" .. tostring(luanum)) then
-         return d
+         return d ~= nil
       end
       return nil, "Lua header lua.h found at " .. d .. " does not match Lua version " .. luaver .. ". You can use `luarocks config variables.LUA_INCDIR <path>` to set the correct location.", "dependency", 2
    end
@@ -857,7 +853,6 @@ end
 
 function deps.check_dependencies(repo, deps_mode)
    local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
-   assert(type(deps_mode) == "string")
    if deps_mode == "none" then deps_mode = cfg.deps_mode end
 
    local manifest = manif.load_manifest(rocks_dir)
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index f54f1458..b9989bbe 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local package = _tl_compat and _tl_compat.package or package; local string = _tl_compat and _tl_compat.string or string
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local package = _tl_compat and _tl_compat.package or package; local string = _tl_compat and _tl_compat.string or string
 
 local dir = {}
 
@@ -19,7 +19,6 @@ local dir_sep = package.config:sub(1, 1)
 
 
 function dir.base_name(pathname)
-   assert(type(pathname) == "string")
 
    local b
    b = pathname:gsub("[/\\]", "/")
@@ -36,7 +35,6 @@ end
 
 
 function dir.dir_name(pathname)
-   assert(type(pathname) == "string")
 
    local d
    d = pathname:gsub("[/\\]", "/")
diff --git a/src/luarocks/fetch/cvs.lua b/src/luarocks/fetch/cvs.lua
index 1c6616ff..6aabfb31 100644
--- a/src/luarocks/fetch/cvs.lua
+++ b/src/luarocks/fetch/cvs.lua
@@ -6,7 +6,6 @@ local cvs = {}
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
-local cfg = require("luarocks.core.cfg")
 
 
 
@@ -41,8 +40,8 @@ function cvs.get_sources(rockspec, extract, dest_dir)
    else
       store_dir = dest_dir
    end
-   local ok, err = fs.change_dir(store_dir)
-   if not ok then return nil, err end
+   local okchange, err = fs.change_dir(store_dir)
+   if not okchange then return nil, err end
    if not fs.execute(_tl_table_unpack(command)) then
       return nil, "Failed fetching files from CVS."
    end
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index 4e7c4bd1..048675e4 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -8,7 +8,6 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/git_file.lua b/src/luarocks/fetch/git_file.lua
index 5319d9a0..40c55a4d 100644
--- a/src/luarocks/fetch/git_file.lua
+++ b/src/luarocks/fetch/git_file.lua
@@ -4,7 +4,6 @@ local git_file = {}
 
 
 local git = require("luarocks.fetch.git")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/git_http.lua b/src/luarocks/fetch/git_http.lua
index 42587cbb..5f660fce 100644
--- a/src/luarocks/fetch/git_http.lua
+++ b/src/luarocks/fetch/git_http.lua
@@ -11,7 +11,6 @@ local git_http = {}
 
 
 local git = require("luarocks.fetch.git")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/git_ssh.lua b/src/luarocks/fetch/git_ssh.lua
index 5411344f..2ab3b7f7 100644
--- a/src/luarocks/fetch/git_ssh.lua
+++ b/src/luarocks/fetch/git_ssh.lua
@@ -11,7 +11,6 @@ local git_ssh = {}
 
 
 local git = require("luarocks.fetch.git")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/hg.lua b/src/luarocks/fetch/hg.lua
index f63942fc..b7c3020b 100644
--- a/src/luarocks/fetch/hg.lua
+++ b/src/luarocks/fetch/hg.lua
@@ -6,7 +6,6 @@ local hg = {}
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/hg_http.lua b/src/luarocks/fetch/hg_http.lua
index 2fde3698..b5b04a86 100644
--- a/src/luarocks/fetch/hg_http.lua
+++ b/src/luarocks/fetch/hg_http.lua
@@ -9,7 +9,6 @@ local hg_http = {}
 
 
 local hg = require("luarocks.fetch.hg")
-local cfg = require("luarocks.core.cfg")
 
 
 
diff --git a/src/luarocks/fetch/sscm.lua b/src/luarocks/fetch/sscm.lua
index 8c80885f..f635c02f 100644
--- a/src/luarocks/fetch/sscm.lua
+++ b/src/luarocks/fetch/sscm.lua
@@ -1,13 +1,12 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local string = _tl_compat and _tl_compat.string or string
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local string = _tl_compat and _tl_compat.string or string
 
 local sscm = {}
 
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
-local cfg = require("luarocks.core.cfg")
 
-local Rockspec = cfg.Rockspec
+
 
 
 
@@ -17,8 +16,6 @@ local Rockspec = cfg.Rockspec
 
 
 function sscm.get_sources(rockspec, extract, dest_dir)
-   assert(rockspec:type() == "rockspec")
-   assert(type(dest_dir) == "string" or not dest_dir)
 
    local sscm_cmd = rockspec.variables.SSCM
    local module = rockspec.source.module or dir.base_name(rockspec.source.url)
diff --git a/src/luarocks/fetch/svn.lua b/src/luarocks/fetch/svn.lua
index eee4ce25..13e34c1e 100644
--- a/src/luarocks/fetch/svn.lua
+++ b/src/luarocks/fetch/svn.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
 
 local svn = {}
 
@@ -6,9 +6,8 @@ local svn = {}
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
-local cfg = require("luarocks.core.cfg")
 
-local Rockspec = cfg.Rockspec
+
 
 
 
@@ -18,8 +17,6 @@ local Rockspec = cfg.Rockspec
 
 
 function svn.get_sources(rockspec, extract, dest_dir)
-   assert(rockspec:type() == "rockspec")
-   assert(type(dest_dir) == "string" or not dest_dir)
 
    local svn_cmd = rockspec.variables.SVN
    local ok, err_msg = fs.is_tool_available(svn_cmd, "Subversion")
@@ -45,13 +42,13 @@ function svn.get_sources(rockspec, extract, dest_dir)
    else
       store_dir = dest_dir
    end
-   local ok, err = fs.change_dir(store_dir)
-   if not ok then return nil, err end
+   local okchange, err = fs.change_dir(store_dir)
+   if not okchange then return nil, err end
    if not fs.execute(_tl_table_unpack(command)) then
       return nil, "Failed fetching files from Subversion."
    end
-   ok, err = fs.change_dir(module)
-   if not ok then return nil, err end
+   okchange, err = fs.change_dir(module)
+   if not okchange then return nil, err end
    for _, d in ipairs(fs.find(".")) do
       if dir.base_name(d) == ".svn" then
          fs.delete(dir.path(store_dir, module, d))
diff --git a/src/luarocks/fun.lua b/src/luarocks/fun.lua
index 95f9177d..5565e7dc 100644
--- a/src/luarocks/fun.lua
+++ b/src/luarocks/fun.lua
@@ -44,17 +44,6 @@ function fun.filter(xs, f)
    return rs
 end
 
-function fun.traverse(t, f)
-   return fun.map(t, function(x)
-
-      if type(x) == "table" then
-         return fun.traverse(x, f)
-      else
-         return f(x)
-      end
-   end)
-end
-
 function fun.reverse_in(t)
    for i = 1, math.floor(#t / 2) do
       local m, n = i, #t - i + 1
@@ -77,23 +66,24 @@ function fun.flip(f)
 end
 
 function fun.find(xs, f)
-   if type(xs) == "function" then
-      for v in xs do
-         local x = f(v)
-         if x then
-            return x
+   if type(xs) == "table" then
+      for _, x in ipairs(xs) do
+         local r = f(x)
+         if r then
+            return r
          end
       end
-   elseif type(xs) == "table" then
-      for _, v in ipairs(xs) do
-         local x = f(v)
-         if x then
-            return x
+   else
+      for x in xs do
+         local r = f(x)
+         if r then
+            return r
          end
       end
    end
 end
 
+
 function fun.partial(f, ...)
    local n = select("#", ...)
    if n == 1 then
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 437ebe3b..27144894 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -12,7 +12,6 @@ local manif = {}
 
 
 
-
 local core = require("luarocks.core.manif")
 local persist = require("luarocks.persist")
 local fetch = require("luarocks.fetch")
@@ -29,9 +28,6 @@ local type_manifest = require("luarocks.type.manifest")
 
 
 
-
-
-
 manif.cache_manifest = core.cache_manifest
 manif.load_rocks_tree_manifests = core.load_rocks_tree_manifests
 manif.scan_dependencies = core.scan_dependencies
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua
index 10dd6743..689bcc6a 100644
--- a/src/luarocks/manif/writer.lua
+++ b/src/luarocks/manif/writer.lua
@@ -34,11 +34,6 @@ local queries = require("luarocks.queries")
 
 
 
-
-
-
-
-
 local function store_package_items(storage, name, version, items)
    assert(not name:match("/"))
 
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 59f0c8cf..5b230d28 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -28,9 +28,6 @@ local signing = require("luarocks.signing")
 
 
 
-
-
-
 function pack.pack_source_rock(rockspec_file)
 
    local rockspec, errload = fetch.load_rockspec(rockspec_file)
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index 5a77cf68..65c1a7d2 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -10,7 +10,6 @@ local util = require("luarocks.core.util")
 
 
 
-
 local path = {}
 
 
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index eb501f2e..d2d17f96 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -1,7 +1,12 @@
 local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
 
-local persist = {}
+local persist = {Writer = {}, }
+
+
+
+
+
 
 
 
@@ -15,13 +20,13 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-persist.run_file = core.run_file
-persist.load_into_table = core.load_into_table
 
 
 
 
 
+persist.run_file = core.run_file
+persist.load_into_table = core.load_into_table
 
 local write_table
 
diff --git a/src/luarocks/queries.lua b/src/luarocks/queries.lua
index 12eb9237..0a3f7150 100644
--- a/src/luarocks/queries.lua
+++ b/src/luarocks/queries.lua
@@ -12,7 +12,6 @@ local query = require("luarocks.core.types.query")
 
 
 
-
 local query_mt = {}
 
 query_mt.__index = query.Query
@@ -58,11 +57,6 @@ end
 
 function queries.new(name, namespace, version, substring, arch, operator)
 
-
-
-
-
-
    operator = operator or "=="
 
    local self = {
@@ -84,7 +78,6 @@ end
 
 function queries.all(arch)
 
-
    return queries.new("", nil, nil, true, arch)
 end
 
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 386bccb0..72d3a1d8 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -21,7 +21,6 @@ local queries = require("luarocks.queries")
 
 
 
-
 local function check_dependents(name, versions, deps_mode)
    local dependents = {}
 
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index c1d80fc8..0b8cd61e 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -55,9 +55,6 @@ local vers = require("luarocks.core.vers")
 
 
 
-
-
-
 local function get_installed_versions(name)
    assert(not name:match("/"))
 
diff --git a/src/luarocks/results.lua b/src/luarocks/results.lua
index a945c48b..dd17e686 100644
--- a/src/luarocks/results.lua
+++ b/src/luarocks/results.lua
@@ -1,25 +1,18 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local string = _tl_compat and _tl_compat.string or string; local results = {Results = {}, }
-
-
-
-
-
-
-
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local string = _tl_compat and _tl_compat.string or string; local results = {}
 
 
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
-local queries = require("luarocks.queries")
 
 
+local result = require("luarocks.core.types.result")
 
 
 local result_mt = {}
 
-result_mt.__index = results.Results
+result_mt.__index = result.Result
 
-function results.Results.type()
+function result.Result.type()
    return "result"
 end
 
@@ -28,8 +21,6 @@ function results.new(name, version, repo, arch, namespace)
    assert(not name:match("/"))
 
 
-
-
    if not namespace then
       name, namespace = util.split_namespace(name)
    end
@@ -63,7 +54,7 @@ end
 
 
 
-function results.Results:satisfies(query)
+function result.Result:satisfies(query)
    return match_name(query, self.name) and
    (query.arch[self.arch] or query.arch["any"]) and
    ((not query.namespace) or (query.namespace == self.namespace)) and
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua
index 1953aec8..5b83f90b 100644
--- a/src/luarocks/rockspecs.lua
+++ b/src/luarocks/rockspecs.lua
@@ -16,8 +16,6 @@ local rock = require("luarocks.core.types.rockspec")
 
 
 
-
-
 local vendored_build_type_set = {
    ["builtin"] = true,
    ["cmake"] = true,
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 1404e303..05ae9b0e 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -22,12 +22,7 @@ local results = require("luarocks.results")
 
 
 
-
-
-
-
 function search.store_result(result_tree, result)
-   assert(type(result_tree) == "table")
 
    local name = result.name
    local version = result.version
diff --git a/src/luarocks/test.lua b/src/luarocks/test.lua
index 7be3d520..fbd404d7 100644
--- a/src/luarocks/test.lua
+++ b/src/luarocks/test.lua
@@ -10,8 +10,6 @@ local util = require("luarocks.util")
 
 
 
-
-
 local test_types = {
    "busted",
    "command",
diff --git a/src/luarocks/test/busted.lua b/src/luarocks/test/busted.lua
index fc3dfe79..bc00b33a 100644
--- a/src/luarocks/test/busted.lua
+++ b/src/luarocks/test/busted.lua
@@ -7,7 +7,7 @@ local deps = require("luarocks.deps")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local queries = require("luarocks.queries")
-
+local install = require("luarocks.cmd.install")
 
 
 
diff --git a/src/luarocks/test/command.lua b/src/luarocks/test/command.lua
index b7f45cef..41d30378 100644
--- a/src/luarocks/test/command.lua
+++ b/src/luarocks/test/command.lua
@@ -7,7 +7,6 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-
 function command.detect_type()
    if fs.exists("test.lua") then
       return true
@@ -29,7 +28,8 @@ function command.run_tests(test, args)
    local ok
 
    if test.script then
-      if type(test.script) ~= "string" then
+      local test_script = test.script
+      if not (type(test_script) == "string") then
          return nil, "Malformed rockspec: 'script' expects a string"
       end
       if not fs.exists(test.script) then
@@ -38,7 +38,8 @@ function command.run_tests(test, args)
       local lua = fs.Q(cfg.variables["LUA"])
       ok = fs.execute(lua, test.script, _tl_table_unpack(args))
    elseif test.command then
-      if type(test.command) ~= "string" then
+      local test_command = test.command
+      if not (type(test_command) == "string") then
          return nil, "Malformed rockspec: 'command' expects a string"
       end
       ok = fs.execute(test.command, _tl_table_unpack(args))
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index fe12244f..80dd532c 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -465,7 +465,7 @@ end
 
 local function check_patched(file, hunks)
    local lineno = 1
-   local ok, err = pcall(function()
+   local _, err = pcall(function()
       if #file == 0 then
          error('nomatch', 0)
       end
diff --git a/src/luarocks/tools/zip.lua b/src/luarocks/tools/zip.lua
index 2b2bf0aa..5821f6d7 100644
--- a/src/luarocks/tools/zip.lua
+++ b/src/luarocks/tools/zip.lua
@@ -1,4 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
 
 local zip = {ZipHandle = {}, LocalFileHeader = {}, Zip = {}, }
@@ -563,8 +563,6 @@ function zip.gzip(input_filename, output_filename)
 end
 
 function zip.gunzip(input_filename, output_filename)
-   assert(type(input_filename) == "string")
-   assert(output_filename == nil or type(output_filename) == "string")
 
    if not output_filename then
       output_filename = input_filename:gsub("%.gz$", "")
diff --git a/src/luarocks/type/manifest.lua b/src/luarocks/type/manifest.lua
index 8b0396ef..3f3be728 100644
--- a/src/luarocks/type/manifest.lua
+++ b/src/luarocks/type/manifest.lua
@@ -1,6 +1,8 @@
 local type_manifest = {}
 
 
+
+
 local type_check = require("luarocks.type_check")
 
 local manifest_formats = type_check.declare_schemas({
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua
index caa99ec1..cd4044f6 100644
--- a/src/luarocks/type/rockspec.lua
+++ b/src/luarocks/type/rockspec.lua
@@ -7,8 +7,6 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 
 
-
-
 local type_check = require("luarocks.type_check")
 
 
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index 457e45f5..f3646708 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -1,11 +1,4 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local os = _tl_compat and _tl_compat.os or os; local package = _tl_compat and _tl_compat.package or package; local pairs = _tl_compat and _tl_compat.pairs or pairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local api = {Configuration = {}, Api = {}, Args = {}, }
-
-
-
-
-
-
-
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local os = _tl_compat and _tl_compat.os or os; local package = _tl_compat and _tl_compat.package or package; local pairs = _tl_compat and _tl_compat.pairs or pairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local api = {Configuration = {}, Api = {}, }
 
 
 
@@ -35,6 +28,8 @@ local Api = api.Api
 
 
 
+
+
 local function upload_config_file()
    if not cfg.config_files.user.file then
       return nil
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 2c8d8ca6..79430110 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -7,10 +7,11 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local core = require("luarocks.core.util")
 local cfg = require("luarocks.core.cfg")
 
-local util = {Fn = {}, Parser = {}, }
 
 
 
+local util = {Fn = {}, Parser = {}, }
+
 
 
 
@@ -51,6 +52,8 @@ util.matchquote = core.matchquote
 
 
 
+local argparse = require("luarocks.vendor.argparse")
+
 
 
 local scheduled_functions = {}