chore: lint

Author: ldez

pkg/goformat/runner.go

@@ -12,7 +12,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/rogpeppe/go-internal/diff"
+	rpdiff "github.com/rogpeppe/go-internal/diff"
 
 	"github.com/golangci/golangci-lint/v2/pkg/config"
 	"github.com/golangci/golangci-lint/v2/pkg/fsutils"
@@ -32,11 +32,11 @@ type Runner struct {
 	exitCode int
 }
 
-func NewRunner(log logutils.Log,
+func NewRunner(logger logutils.Log,
 	metaFormatter *goformatters.MetaFormatter, matcher *processors.GeneratedFileMatcher,
 	opts RunnerOptions) *Runner {
 	return &Runner{
-		log:           log,
+		log:           logger,
 		matcher:       matcher,
 		metaFormatter: metaFormatter,
 		opts:          opts,
@@ -128,7 +128,7 @@ func (c *Runner) process(path string, stdout io.Writer, in io.Reader) error {
 	if c.opts.diff {
 		newName := filepath.ToSlash(path)
 		oldName := newName + ".orig"
-		_, err = stdout.Write(diff.Diff(oldName, input, newName, output))
+		_, err = stdout.Write(rpdiff.Diff(oldName, input, newName, output))
 		if err != nil {
 			return err
 		}

pkg/golinters/revive/revive.go

@@ -453,11 +453,11 @@ func extractRulesName(rules []lint.Rule) []string {
 
 // Extracted from https://github.com/mgechev/revive/blob/v1.7.0/formatter/severity.go
 // Modified to use pointers (related to hugeParam rule).
-func severity(config *lint.Config, failure *lint.Failure) lint.Severity {
-	if cfg, ok := config.Rules[failure.RuleName]; ok && cfg.Severity == lint.SeverityError {
+func severity(cfg *lint.Config, failure *lint.Failure) lint.Severity {
+	if cfg, ok := cfg.Rules[failure.RuleName]; ok && cfg.Severity == lint.SeverityError {
 		return lint.SeverityError
 	}
-	if cfg, ok := config.Directives[failure.RuleName]; ok && cfg.Severity == lint.SeverityError {
+	if cfg, ok := cfg.Directives[failure.RuleName]; ok && cfg.Severity == lint.SeverityError {
 		return lint.SeverityError
 	}
 	return lint.SeverityWarning

pkg/lint/package.go

@@ -39,13 +39,13 @@ type PackageLoader struct {
 }
 
 // NewPackageLoader creates a new PackageLoader.
-func NewPackageLoader(log logutils.Log, cfg *config.Config, args []string, goenv *goutil.Env, loadGuard *load.Guard) *PackageLoader {
+func NewPackageLoader(log logutils.Log, cfg *config.Config, args []string, env *goutil.Env, loadGuard *load.Guard) *PackageLoader {
 	return &PackageLoader{
 		cfg:         cfg,
 		args:        args,
 		log:         log,
 		debugf:      logutils.Debug(logutils.DebugKeyLoader),
-		goenv:       goenv,
+		goenv:       env,
 		pkgTestIDRe: regexp.MustCompile(`^(.*) \[(.*)\.test\]`),
 		loadGuard:   loadGuard,
 	}