diff --git a/.golangci.yml b/.golangci.yml index f14d77b30..e2100ce23 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -240,7 +240,6 @@ linters: - maintidx - nonamedreturns - paralleltest - - scopelint - structcheck - testableexamples - testpackage @@ -294,6 +293,7 @@ issues: - predeclared - path: _test\.go linters: + - scopelint - funlen - unused - unparam diff --git a/examples/ttl/series.go b/examples/ttl/series.go index a6e4753c3..67f7759dc 100644 --- a/examples/ttl/series.go +++ b/examples/ttl/series.go @@ -268,9 +268,10 @@ func createTables(ctx context.Context, c table.Client, prefix string) (err error } for i := 0; i < expirationQueueCount; i++ { + tableName := path.Join(prefix, fmt.Sprintf("expiration_queue_%v", i)) err = c.Do(ctx, func(ctx context.Context, s table.Session) error { - return s.CreateTable(ctx, path.Join(prefix, fmt.Sprintf("expiration_queue_%v", i)), + return s.CreateTable(ctx, tableName, options.WithColumn("doc_id", types.Optional(types.TypeUint64)), options.WithColumn("ts", types.Optional(types.TypeUint64)), options.WithPrimaryKeyColumn("ts", "doc_id"), diff --git a/internal/cmd/gtrace/writer.go b/internal/cmd/gtrace/writer.go index 23dfd6181..8b0b30552 100644 --- a/internal/cmd/gtrace/writer.go +++ b/internal/cmd/gtrace/writer.go @@ -406,9 +406,9 @@ func (w *Writer) composeHookCall(fn *Func, h1, h2 string) { w.line("if " + h + " != nil {") w.block(func() { if fn.HasResult() { - w.code(rs[i], ` = `) + w.code(rs[i], ` = `) //nolint:scopelint } - w.code(h) + w.code(h) //nolint:scopelint w.call(args) }) w.line("}")