aboutsummaryrefslogtreecommitdiffstats
path: root/tools/migration/migrator/mtools.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-04 01:08:27 +0100
committerKim Alvefur <zash@zash.se>2017-02-04 01:08:27 +0100
commite902bcea2ee39bf7fdeda44d9f28dd8c893084d7 (patch)
tree300927642fc0f857d9ea96ab4b1e2bc2d4c20950 /tools/migration/migrator/mtools.lua
parentf01dafc6febdb8e36bfe475853f8e1d4b6ccf8cd (diff)
parent0e99534951484e5c1ab98897272c92ea6b13f8ff (diff)
downloadprosody-e902bcea2ee39bf7fdeda44d9f28dd8c893084d7.tar.gz
prosody-e902bcea2ee39bf7fdeda44d9f28dd8c893084d7.zip
Merge 0.10->trunk
Diffstat (limited to 'tools/migration/migrator/mtools.lua')
-rw-r--r--tools/migration/migrator/mtools.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/migration/migrator/mtools.lua b/tools/migration/migrator/mtools.lua
index e7b774bb..cfbfcce8 100644
--- a/tools/migration/migrator/mtools.lua
+++ b/tools/migration/migrator/mtools.lua
@@ -4,9 +4,8 @@ local print = print;
local t_insert = table.insert;
local t_sort = table.sort;
-module "mtools"
-function sorted(params)
+local function sorted(params)
local reader = params.reader; -- iterator to get items from
local sorter = params.sorter; -- sorting function
@@ -28,7 +27,7 @@ function sorted(params)
end
-function merged(reader, merger)
+local function merged(reader, merger)
local item1 = reader();
local merged = { item1 };
@@ -53,4 +52,7 @@ function merged(reader, merger)
end
-return _M;
+return {
+ sorted = sorted;
+ merged = merged;
+}