fix almost all redeclerations

28 files changed, 115 insertions, 116 deletions

diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index bbb070f2..b8501924 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -1,8 +1,8 @@
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
-local type Variables = rockspec.Variables
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type Variables = r.Variables
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
 local record cfg
    detect_sysconfdir: function(): string
diff --git a/src/luarocks/core/manif.tl b/src/luarocks/core/manif.tl
index 742e64b7..7ef018db 100644
--- a/src/luarocks/core/manif.tl
+++ b/src/luarocks/core/manif.tl
@@ -1,4 +1,7 @@
 
+--- Core functions for querying manifest files.
+local record manif
+end
 
 local persist = require("luarocks.core.persist")
 local cfg = require("luarocks.core.cfg")
@@ -7,20 +10,17 @@ local util = require("luarocks.core.util")
 local vers = require("luarocks.core.vers")
 local path = require("luarocks.core.path")
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+--------------------------------------------------------------------------------
 
---- Core functions for querying manifest files.
-local record manif
-end
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
---------------------------------------------------------------------------------
-local type query = require("luarocks.core.types.query")
-local type Query = query.Query
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
-local type manifest = require("luarocks.core.types.manifest")
-local type Manifest = manifest.Manifest
-local type Tree_manifest = manifest.Tree_manifest
+local type m = require("luarocks.core.types.manifest")
+local type Manifest = m.Manifest
+local type Tree_manifest = m.Tree_manifest
 
 
 
diff --git a/src/luarocks/core/path.tl b/src/luarocks/core/path.tl
index 563a36ef..37421445 100644
--- a/src/luarocks/core/path.tl
+++ b/src/luarocks/core/path.tl
@@ -5,8 +5,8 @@ end
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.core.dir")
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
 local dir_sep = package.config:sub(1, 1)
 --------------------------------------------------------------------------------
diff --git a/src/luarocks/core/types/manifest.d.tl b/src/luarocks/core/types/manifest.d.tl
index f24869b9..de1319d4 100644
--- a/src/luarocks/core/types/manifest.d.tl
+++ b/src/luarocks/core/types/manifest.d.tl
@@ -1,8 +1,8 @@
-local type query = require("luarocks.core.types.query")
-local type Query = query.Query
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
 local record manifest
     record Manifest
diff --git a/src/luarocks/core/types/query.d.tl b/src/luarocks/core/types/query.d.tl
index e1ef21b6..b23579af 100644
--- a/src/luarocks/core/types/query.d.tl
+++ b/src/luarocks/core/types/query.d.tl
@@ -1,5 +1,5 @@
-local type version = require("luarocks.core.types.version")
-local type Constraint = version.Constraint
+local type v = require("luarocks.core.types.version")
+local type Constraint = v.Constraint
 
 local record query
     record Query
diff --git a/src/luarocks/core/types/rockspec.d.tl b/src/luarocks/core/types/rockspec.d.tl
index 027cefb4..04dbcd82 100644
--- a/src/luarocks/core/types/rockspec.d.tl
+++ b/src/luarocks/core/types/rockspec.d.tl
@@ -1,5 +1,5 @@
-local type query = require("luarocks.core.types.query")
-local type Query = query.Query
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
 local record rockspec
     record Description
diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index 56c0072e..ede0e75f 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -4,9 +4,9 @@ end
 
 --------------------------------------------------------------------------------
 
-local type ordering = require("luarocks.core.types.ordering")
-local type Ordering = ordering.Ordering
-local type SortBy = ordering.SortBy
+local type o = require("luarocks.core.types.ordering")
+local type Ordering = o.Ordering
+local type SortBy = o.SortBy
 
 local dir_sep = package.config:sub(1, 1)
 
diff --git a/src/luarocks/core/vers.tl b/src/luarocks/core/vers.tl
index ab1c6c5b..f7ecdb98 100644
--- a/src/luarocks/core/vers.tl
+++ b/src/luarocks/core/vers.tl
@@ -2,9 +2,9 @@ local record vers
 end
 
 local util = require("luarocks.core.util")
-local type version = require("luarocks.core.types.version")
-local type Version = version.Version
-local type Constraint = version.Constraint
+local type v = require("luarocks.core.types.version")
+local type Version = v.Version
+local type Constraint = v.Constraint
 --------------------------------------------------------------------------------
 
 local deltas: {string: integer} = {
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index cf552ef8..104be1b9 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -13,16 +13,17 @@ local vers = require("luarocks.core.vers")
 local queries = require("luarocks.queries")
 local deplocks = require("luarocks.deplocks")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
-local core = require("luarocks.core.manif")
-local type DependencyVersion = core.DependencyVersion
-local type version = require("luarocks.core.types.version")
-local type Version = version.Version
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
+
+local type v = require("luarocks.core.types.version")
+local type Version = v.Version
 
 --- Generate a function that matches dep queries against the manifest,
 -- taking into account rocks_provided, the list of versions to skip,
@@ -41,9 +42,9 @@ local type Version = version.Version
 -- * map of versions to locations
 -- * version matched via lockfile if any
 -- * true if rock matched via rocks_provided
-local function prepare_get_versions(deps_mode: string, rocks_provided: {string : string}, depskey: string, skip_set?): function(DependencyVersion): {string}, {string: string | Tree}, string, boolean
+local function prepare_get_versions(deps_mode: string, rocks_provided: {string : string}, depskey: string, skip_set?): function(Query): {string}, {string: string | Tree}, string, boolean
 
-   return function(dep: DependencyVersion): {string}, {string: string | Tree}, string, boolean
+   return function(dep: Query): {string}, {string: string | Tree}, string, boolean
       local versions, locations: {string}, {string: string | Tree}
       local provided = rocks_provided[dep.name]
       if provided then
@@ -83,8 +84,8 @@ end
 -- 2. nil
 -- 3. either 'dep' or an alternative query to be used
 -- 4. false
-local function match_dep(dep: DependencyVersion, 
-   get_versions: function(DependencyVersion): {string}, {string: string | Tree}, string, boolean): string, string | Tree, DependencyVersion, boolean
+local function match_dep(dep: Query, 
+   get_versions: function(Query): {string}, {string: string | Tree}, string, boolean): string, string | Tree, Query, boolean
 
    local versions, locations, lockversion, provided = get_versions(dep)
 
@@ -112,8 +113,8 @@ local function match_dep(dep: DependencyVersion,
    return latest_vstring, locations[latest_vstring], dep, provided
 end
 
-local function match_all_deps(dependencies: {DependencyVersion}, 
-   get_versions: function(DependencyVersion): {string}, {string: string | Tree}, string, boolean): {DependencyVersion: any}, {string}, {string}
+local function match_all_deps(dependencies: {Query}, 
+   get_versions: function(Query): {string}, {string: string | Tree}, string, boolean): {Query: any}, {string}, {string}
 
    local matched, missing, no_upgrade = {}, {}, {}
 
diff --git a/src/luarocks/fetch.tl b/src/luarocks/fetch.tl
index 321d4f4e..6612b253 100644
--- a/src/luarocks/fetch.tl
+++ b/src/luarocks/fetch.tl
@@ -16,8 +16,8 @@ local cfg = require("luarocks.core.cfg")
 
 local type Fetch = fetch.Fetch
 local type Lock = fs.Lock --!
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 
 local function ensure_trailing_slash(url: string): string
diff --git a/src/luarocks/fetch/cvs.tl b/src/luarocks/fetch/cvs.tl
index f40d0991..a2f67dcf 100644
--- a/src/luarocks/fetch/cvs.tl
+++ b/src/luarocks/fetch/cvs.tl
@@ -7,8 +7,8 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Download sources for building a rock, using CVS.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git.tl b/src/luarocks/fetch/git.tl
index 1a4438c9..466c4039 100644
--- a/src/luarocks/fetch/git.tl
+++ b/src/luarocks/fetch/git.tl
@@ -9,10 +9,10 @@ local dir = require("luarocks.dir")
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
-local type version = require("luarocks.core.types.version")
-local type Version = version.Version
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type v = require("luarocks.core.types.version")
+local type Version = v.Version
 
 local cached_git_version: Version
 
diff --git a/src/luarocks/fetch/git_file.tl b/src/luarocks/fetch/git_file.tl
index 858e67a3..06ada30b 100644
--- a/src/luarocks/fetch/git_file.tl
+++ b/src/luarocks/fetch/git_file.tl
@@ -5,8 +5,8 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git_http.tl b/src/luarocks/fetch/git_http.tl
index a7b3d692..ecf23763 100644
--- a/src/luarocks/fetch/git_http.tl
+++ b/src/luarocks/fetch/git_http.tl
@@ -12,8 +12,8 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git_ssh.tl b/src/luarocks/fetch/git_ssh.tl
index 65954353..0d6f9742 100644
--- a/src/luarocks/fetch/git_ssh.tl
+++ b/src/luarocks/fetch/git_ssh.tl
@@ -12,8 +12,8 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/hg.tl b/src/luarocks/fetch/hg.tl
index 0fbf5601..cbdcdc86 100644
--- a/src/luarocks/fetch/hg.tl
+++ b/src/luarocks/fetch/hg.tl
@@ -7,8 +7,8 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Download sources for building a rock, using hg.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/hg_http.tl b/src/luarocks/fetch/hg_http.tl
index f526d2d5..218543cd 100644
--- a/src/luarocks/fetch/hg_http.tl
+++ b/src/luarocks/fetch/hg_http.tl
@@ -10,8 +10,8 @@ end
 
 local hg = require("luarocks.fetch.hg")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Download sources for building a rock, using hg over http.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/sscm.tl b/src/luarocks/fetch/sscm.tl
index ad5a615e..fd9b2ef5 100644
--- a/src/luarocks/fetch/sscm.tl
+++ b/src/luarocks/fetch/sscm.tl
@@ -6,8 +6,8 @@ end
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Download sources via Surround SCM Server for building a rock.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/svn.tl b/src/luarocks/fetch/svn.tl
index df3cdde9..3db136e9 100644
--- a/src/luarocks/fetch/svn.tl
+++ b/src/luarocks/fetch/svn.tl
@@ -7,8 +7,8 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 --- Download sources for building a rock, using Subversion.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index f1963150..7a003021 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -9,9 +9,9 @@ local record manif
    rock_manifest_cache: {string: RockManifest}
 end
 
-local type rockmanifest = require("luarocks.core.types.rockmanifest")
-local type RockManifest = rockmanifest.RockManifest
-local type Entry = rockmanifest.RockManifest.Entry
+local type rm = require("luarocks.core.types.rockmanifest")
+local type RockManifest = rm.RockManifest
+local type Entry = rm.RockManifest.Entry
 
 local core = require("luarocks.core.manif")
 local persist = require("luarocks.persist")
@@ -24,13 +24,13 @@ local util = require("luarocks.util")
 local queries = require("luarocks.queries")
 local type_manifest = require("luarocks.type.manifest")
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 local type m = require("luarocks.core.types.manifest")
 local type Manifest = m.Manifest
-local type Tree_manifest = m  .Tree_manifest
-local type query = require("luarocks.core.types.query")
-local type Query = query.Query
+local type Tree_manifest = m.Tree_manifest
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
 manif.cache_manifest = core.cache_manifest
 manif.load_rocks_tree_manifests = core.load_rocks_tree_manifests
diff --git a/src/luarocks/path.tl b/src/luarocks/path.tl
index 1dc77e86..908b5952 100644
--- a/src/luarocks/path.tl
+++ b/src/luarocks/path.tl
@@ -8,8 +8,8 @@ local core = require("luarocks.core.path")
 local dir = require("luarocks.dir")
 local util = require("luarocks.core.util")
 
-local type tree = require("luarocks.core.types.tree")
-local type Tree = tree.Tree
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
 local record path
    rocks_dir: function(string | Tree): string
diff --git a/src/luarocks/queries.tl b/src/luarocks/queries.tl
index dec57585..bed7612c 100644
--- a/src/luarocks/queries.tl
+++ b/src/luarocks/queries.tl
@@ -6,22 +6,23 @@ local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
-local type query = require("luarocks.core.types.query")
-local type version = require("luarocks.core.types.version")
-local type Query = query.Query
-local type Version = version.Version
-local type Constraint = version.Constraint
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
+
+local type v = require("luarocks.core.types.version")
+local type Version = v.Version
+local type Constraint = v.Constraint
 
 local query_mt: metatable<Query> = {}
 
-query_mt.__index = query.Query
+query_mt.__index = q.Query
 
-function query.Query.type(): string  --? remove later
+function q.Query.type(): string  --? remove later
    return "query"
 end
 
 -- Fallback default value for the `arch` field, if not explicitly set.
-query.Query.arch = {
+q.Query.arch = {
    src = true,
    all = true,
    rockspec = true,
@@ -30,7 +31,7 @@ query.Query.arch = {
 }
 
 -- Fallback default value for the `substring` field, if not explicitly set.
-query.Query.substring = false
+q.Query.substring = false
 
 --- Convert the arch field of a query table to table format.
 -- @param input string, table or nil
@@ -75,7 +76,7 @@ function queries.new(name: string, namespace?: string, version?: string, substri
       table.insert(self.constraints, { op = operator, version = vers.parse_version(version)})
    end
 
-   query.Query.arch[cfg.arch] = true
+   q.Query.arch[cfg.arch] = true
    return setmetatable(self, query_mt)
 end
 
@@ -179,13 +180,13 @@ do
          constraints = constraints,
       }
 
-      query.Query.arch[cfg.arch] = true
+      q.Query.arch[cfg.arch] = true
       return setmetatable(self, query_mt)
    end
 end
 
 function queries.from_persisted_table(tbl: Query): Query
-   query.Query.arch[cfg.arch] = true
+   q.Query.arch[cfg.arch] = true
    return setmetatable(tbl, query_mt)
 end
 
diff --git a/src/luarocks/results.tl b/src/luarocks/results.tl
index 99f70ec4..cbe6704d 100644
--- a/src/luarocks/results.tl
+++ b/src/luarocks/results.tl
@@ -10,10 +10,10 @@ end
 
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
-local type query = require("luarocks.core.types.query")
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
 local type Results = results.Results
-local type Query = query.Query
 
 local result_mt: metatable<Results> = {}
 
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index 175428c4..3ea6c147 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -9,15 +9,12 @@ local type_rockspec = require("luarocks.type.rockspec")
 local util = require("luarocks.util")
 local vers = require("luarocks.core.vers")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type Variables = r.Variables
 
--- local type Query = require("luarocks.core.types.query").Query --TEAL BUG #778
-
-local type query = require("luarocks.core.types.query")
-local type Query = query.Query
-
-local type Variables = rockspec.Variables
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
 local vendored_build_type_set: {string: boolean} = {
    ["builtin"] = true,
@@ -30,9 +27,9 @@ local vendored_build_type_set: {string: boolean} = {
 
 local rockspec_mt: metatable<Rockspec> = {}
 
-rockspec_mt.__index = rockspec.Rockspec
+rockspec_mt.__index = r.Rockspec
 
-function rockspec.Rockspec.type(): string
+function r.Rockspec.type(): string
    return "rockspec"
 end
 
diff --git a/src/luarocks/test.tl b/src/luarocks/test.tl
index ec2b0ada..56bc8c74 100644
--- a/src/luarocks/test.tl
+++ b/src/luarocks/test.tl
@@ -5,9 +5,9 @@ local fetch = require("luarocks.fetch")
 local deps = require("luarocks.deps")
 local util = require("luarocks.util")
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
-local type Test = rockspec.Test
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type Test = r.Test
 
 local test_types = {
    "busted",
diff --git a/src/luarocks/type/manifest.tl b/src/luarocks/type/manifest.tl
index 3114b82a..2f9a8a5d 100644
--- a/src/luarocks/type/manifest.tl
+++ b/src/luarocks/type/manifest.tl
@@ -1,8 +1,8 @@
 local record type_manifest
 end
 
-local type manifest = require("luarocks.core.types.manifest")
-local type Manifest = manifest.Manifest
+local type m = require("luarocks.core.types.manifest")
+local type Manifest = m.Manifest
 
 local type_check = require("luarocks.type_check")
 
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 014dc4d3..8458c6f7 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -3,11 +3,11 @@ local record type_rockspec
    rockspec_format: string
 end
 
-local type ordering = require("luarocks.core.types.ordering")
-local type Ordering = ordering.Ordering
+local type o = require("luarocks.core.types.ordering")
+local type Ordering = o.Ordering
 
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 
 local type_check = require("luarocks.type_check")
 
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index 4b4fd3bd..9e940f8c 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -7,9 +7,9 @@
 local core = require("luarocks.core.util")
 local cfg = require("luarocks.core.cfg")
 
-local type ordering = require("luarocks.core.types.ordering")
-local type Ordering = ordering.Ordering
-local type SortBy = ordering.SortBy
+local type o = require("luarocks.core.types.ordering")
+local type Ordering = o.Ordering
+local type SortBy = o.SortBy
 
 local record util
    cleanup_path: function(string, string, string, boolean): string
@@ -51,8 +51,8 @@ util.keys = core.keys
 util.matchquote = core.matchquote
 
 local type Fn = util.Fn
-local type rockspec = require("luarocks.core.types.rockspec")
-local type Rockspec = rockspec.Rockspec
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
 local type Parser = util.Parser