1 files changed, 2 insertions, 37 deletions

diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index c7ab9283..b3b01704 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -14,6 +14,8 @@ path.versioned_name = core.versioned_name
 path.path_to_module = core.path_to_module
 path.deploy_lua_dir = core.deploy_lua_dir
 path.deploy_lib_dir = core.deploy_lib_dir
+path.map_trees = core.map_trees
+path.rocks_tree_to_string = core.rocks_tree_to_string
 
 --- Infer rockspec filename from a rock filename.
 -- @param rock_name string: Pathname of a rock file.
@@ -226,43 +228,6 @@ function path.use_tree(tree)
    --              .. package.cpath
 end
 
-function path.rocks_tree_to_string(tree)
-   if type(tree) == "string" then
-      return tree
-   else
-      assert(type(tree) == "table")
-      return tree.root
-   end
-end
-
---- Apply a given function to the active rocks trees based on chosen dependency mode.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for no trees (this function becomes a nop).
--- @param fn function: function to be applied, with the tree dir (string) as the first
--- argument and the remaining varargs of map_trees as the following arguments.
--- @return a table with all results of invocations of fn collected.
-function path.map_trees(deps_mode, fn, ...)
-   local result = {}
-   if deps_mode == "one" then
-      table.insert(result, (fn(cfg.root_dir, ...)) or 0)
-   elseif deps_mode == "all" or deps_mode == "order" then
-      local use = false
-      if deps_mode == "all" then
-         use = true
-      end
-      for _, tree in ipairs(cfg.rocks_trees) do
-         if dir.normalize(path.rocks_tree_to_string(tree)) == dir.normalize(path.rocks_tree_to_string(cfg.root_dir)) then
-            use = true
-         end
-         if use then
-            table.insert(result, (fn(tree, ...)) or 0)
-         end
-      end
-   end
-   return result
-end
-
 --- Get the namespace of a locally-installed rock, if any.
 -- @param name string: The rock name, without a namespace.
 -- @param version string: The rock version.