From: sergeyb@tarantool.org
To: tarantool-patches@dev.tarantool.org, imun@tarantool.org,
v.shpilevoy@tarantool.org
Cc: alexander.turenko@tarantool.org
Subject: [Tarantool-patches] [PATCH 4/6] Fix luacheck warnings in extra/dist/
Date: Thu, 4 Jun 2020 11:39:09 +0300 [thread overview]
Message-ID: <ebc4456b6256976f1112483b642705bd2a0f5ff6.1591259297.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <cover.1591259297.git.sergeyb@tarantool.org>
From: Sergey Bronnikov <sergeyb@tarantool.org>
Part of #4681
Reviewed-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Reviewed-by: Igor Munkin <imun@tarantool.org>
Co-authored-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Co-authored-by: Igor Munkin <imun@tarantool.org>
---
.luacheckrc | 15 ++++++++++++++-
| 25 +++++++------------------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/.luacheckrc b/.luacheckrc
index e6edf8617..b917eb927 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,12 +1,19 @@
std = "luajit"
+globals = {"box", "_TARANTOOL"}
+ignore = {
+ "212/self", -- Unused argument <self>.
+ "411", -- Redefining a local variable.
+ "431", -- Shadowing an upvalue.
+}
+
include_files = {
"**/*.lua",
+ "extra/dist/tarantoolctl.in",
}
exclude_files = {
"build/**/*.lua",
- "extra/**/*.lua",
"src/**/*.lua",
"test-run/**/*.lua",
"test/**/*.lua",
@@ -14,3 +21,9 @@ exclude_files = {
".rocks/**/*.lua",
".git/**/*.lua",
}
+
+files["extra/dist/tarantoolctl.in"] = {
+ ignore = {
+ "122", -- https://github.com/tarantool/tarantool/issues/4929
+ },
+}
--git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index a98c61b52..90caf58ad 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -63,13 +63,12 @@ end
local function check_user_level()
local uid = os.getenv('UID')
- local udir = nil
if uid == 0 or os.getenv("NOTIFY_SOCKET") then
return nil
end
-- local dir configuration
local pwd = os.getenv('PWD')
- udir = pwd and pwd .. '/.tarantoolctl'
+ local udir = pwd and pwd .. '/.tarantoolctl'
udir = udir and fio.stat(udir) and udir or nil
-- or home dir configuration
local homedir = os.getenv('HOME')
@@ -789,7 +788,7 @@ end
local function eval()
local console_sock_path = uri.parse(console_sock).service
local filename = arg[3]
- local code = nil
+ local code
if filename == nil then
if stdin_isatty() then
log.error("Usage:")
@@ -847,7 +846,6 @@ end
-- xlog / snap file, so even when it stops on LSN >= @a opts.to on
-- a current file a next file will be processed.
local function filter_xlog(gen, param, state, opts, cb)
- local spaces = opts.spaces
local from, to, spaces = opts.from, opts.to, opts.space
local show_system, replicas = opts['show-system'], opts.replica
@@ -861,7 +859,7 @@ local function filter_xlog(gen, param, state, opts, cb)
elseif (lsn < from) or (lsn >= to) or
(not spaces and sid and sid < 512 and not show_system) or
(spaces and (sid == nil or not find_in_list(sid, spaces))) or
- (replicas and not find_in_list(rid, replicas)) then
+ (replicas and not find_in_list(rid, replicas)) then -- luacheck: ignore
-- pass this tuple
else
cb(record)
@@ -874,7 +872,7 @@ local function cat()
local cat_format = opts.format
local format_cb = cat_formats[cat_format]
local is_printed = false
- for id, file in ipairs(positional_arguments) do
+ for _, file in ipairs(positional_arguments) do
log.error("Processing file '%s'", file)
local gen, param, state = xlog.pairs(file)
filter_xlog(gen, param, state, opts, function(record)
@@ -900,7 +898,7 @@ local function play()
if not remote:wait_connected() then
error(("Error while connecting to host '%s'"):format(uri))
end
- for id, file in ipairs(positional_arguments) do
+ for _, file in ipairs(positional_arguments) do
log.info(("Processing file '%s'"):format(file))
local gen, param, state = xlog.pairs(file)
filter_xlog(gen, param, state, opts, function(record)
@@ -921,22 +919,13 @@ local function play()
remote:close()
end
-local function find_arg(name_arg)
- for i, key in ipairs(arg) do
- if key:find(name_arg) ~= nil then
- return key
- end
- end
- return nil
-end
-
local function rocks()
local cfg = require("luarocks.core.cfg")
cfg.init()
local util = require("luarocks.util")
local command_line = require("luarocks.cmd")
-- Tweak help messages
- util.see_help = function(command, program)
+ util.see_help = function(command, program) -- luacheck: no unused args
-- TODO: print extended help message here
return "See Tarantool documentation for help."
end
@@ -1215,7 +1204,7 @@ local function usage_command(name, cmd)
if type(header) == 'string' then
header = { header }
end
- for no, line in ipairs(header) do
+ for _, line in ipairs(header) do
log.error(" " .. line, name)
end
end
--
2.23.0
next prev parent reply other threads:[~2020-06-04 8:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-04 8:39 [Tarantool-patches] [PATCH 0/6] Add static analysis of Lua code in src/ and extra/ with luacheck sergeyb
2020-06-04 8:39 ` [Tarantool-patches] [PATCH 1/6] Add initial luacheck config sergeyb
2020-06-06 18:02 ` Vladislav Shpilevoy
2020-06-09 16:16 ` Sergey Bronnikov
2020-06-04 8:39 ` [Tarantool-patches] [PATCH 2/6] build: enable 'make luacheck' target sergeyb
2020-06-04 8:39 ` [Tarantool-patches] [PATCH 3/6] gitlab-ci: enable static analysis with luacheck sergeyb
2020-06-04 8:39 ` sergeyb [this message]
2020-06-06 18:02 ` [Tarantool-patches] [PATCH 4/6] Fix luacheck warnings in extra/dist/ Vladislav Shpilevoy
2020-06-09 16:17 ` Sergey Bronnikov
2020-06-19 23:15 ` Vladislav Shpilevoy
2020-07-05 16:28 ` Vladislav Shpilevoy
2020-07-12 15:37 ` Vladislav Shpilevoy
2020-07-13 10:01 ` Sergey Bronnikov
2020-06-04 8:39 ` [Tarantool-patches] [PATCH 5/6] Fix luacheck warnings in src/lua/ sergeyb
2020-06-06 18:03 ` Vladislav Shpilevoy
2020-06-11 12:00 ` Sergey Bronnikov
2020-06-11 19:52 ` Vladislav Shpilevoy
2020-06-18 9:32 ` Sergey Bronnikov
2020-06-18 9:35 ` Sergey Bronnikov
2020-06-11 17:22 ` Igor Munkin
2020-07-05 16:28 ` Vladislav Shpilevoy
2020-07-10 16:55 ` Sergey Bronnikov
2020-07-12 15:37 ` Vladislav Shpilevoy
2020-07-13 9:51 ` Sergey Bronnikov
2020-07-13 22:59 ` Vladislav Shpilevoy
2020-06-04 8:39 ` [Tarantool-patches] [PATCH 6/6] Fix luacheck warnings in src/box/lua/ sergeyb
2020-06-06 18:03 ` Vladislav Shpilevoy
2020-06-11 12:01 ` Sergey Bronnikov
2020-06-18 9:37 ` Sergey Bronnikov
2020-06-19 23:15 ` Vladislav Shpilevoy
2020-07-01 14:02 ` Sergey Bronnikov
2020-07-13 22:59 ` Vladislav Shpilevoy
2020-07-14 10:54 ` Sergey Bronnikov
2020-07-14 11:24 ` Sergey Bronnikov
2020-06-04 8:43 ` [Tarantool-patches] [PATCH 0/6] Add static analysis of Lua code in src/ and extra/ with luacheck Sergey Bronnikov
2020-06-19 23:15 ` Vladislav Shpilevoy
2020-07-13 9:53 ` Sergey Bronnikov
2020-06-04 9:04 ` Igor Munkin
2020-06-04 11:17 ` Sergey Bronnikov
2020-07-14 22:49 ` Vladislav Shpilevoy
2020-07-15 9:51 ` Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ebc4456b6256976f1112483b642705bd2a0f5ff6.1591259297.git.sergeyb@tarantool.org \
--to=sergeyb@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=imun@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 4/6] Fix luacheck warnings in extra/dist/' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox