util.sql: Fix log level of debug message

[prosody.git] / util / set.lua

diff --git a/util/set.lua b/util/set.lua
index e9dfec1bca729b509040e785248389187dca8abd..4be39c1702da817cb2e2435c403233c9cad2240b 100644 (file)
--- a/util/set.lua
+++ b/util/set.lua
@@ -23,7 +23,7 @@ function set_mt.__sub(set1, set2)
        return _M.difference(set1, set2);
 end
 function set_mt.__div(set, func)
-       local new_set, new_items = _M.new();
+       local new_set = _M.new();
        local items, new_items = set._items, new_set._items;
        for item in pairs(items) do
                local new_item = func(item);
@@ -34,7 +34,7 @@ function set_mt.__div(set, func)
        return new_set;
 end
 function set_mt.__eq(set1, set2)
-       local set1, set2 = set1._items, set2._items;
+       set1, set2 = set1._items, set2._items;
        for item in pairs(set1) do
                if not set2[item] then
                        return false;
@@ -66,6 +66,9 @@ function new(list)
        local items = setmetatable({}, items_mt);
        local set = { _items = items };
 
+       -- We access the set through an upvalue in these methods, so ignore 'self' being unused
+       --luacheck: ignore 212/self
+
        function set:add(item)
                items[item] = true;
        end
@@ -75,29 +78,29 @@ function new(list)
        end
 
        function set:items()
-               return items;
+               return next, items;
        end
 
        function set:remove(item)
                items[item] = nil;
        end
 
-       function set:add_list(list)
-               if list then
-                       for _, item in ipairs(list) do
+       function set:add_list(item_list)
+               if item_list then
+                       for _, item in ipairs(item_list) do
                                items[item] = true;
                        end
                end
        end
 
        function set:include(otherset)
-               for item in pairs(otherset) do
+               for item in otherset do
                        items[item] = true;
                end
        end
 
        function set:exclude(otherset)
-               for item in pairs(otherset) do
+               for item in otherset do
                        items[item] = nil;
                end
        end