dev: some simplifications (#5843)

Author: alexandear

pkg/commands/internal/migrate/migrate_linter_names.go

@@ -749,11 +749,8 @@ func allEnabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
 	var results []LinterInfo
 
 	for _, linter := range linters {
-		for _, name := range old.Enable {
-			if linter.isName(name) {
-				results = append(results, linter)
-				break
-			}
+		if slices.ContainsFunc(old.Enable, linter.isName) {
+			results = append(results, linter)
 		}
 	}
 
@@ -764,11 +761,8 @@ func allDisabled(old versionone.Linters, linters []LinterInfo) []LinterInfo {
 	var results []LinterInfo
 
 	for _, linter := range linters {
-		for _, name := range old.Disable {
-			if linter.isName(name) {
-				results = append(results, linter)
-				break
-			}
+		if slices.ContainsFunc(old.Disable, linter.isName) {
+			results = append(results, linter)
 		}
 	}
 

pkg/goformatters/internal/diff.go

@@ -250,10 +250,7 @@ func ExtractDiagnosticFromPatch(
 }
 
 func toDiagnostic(ft *token.File, change Change, adjLine int) analysis.Diagnostic {
-	from := change.From + adjLine
-	if from > ft.LineCount() {
-		from = ft.LineCount()
-	}
+	from := min(change.From+adjLine, ft.LineCount())
 
 	start := ft.LineStart(from)
 

pkg/golinters/govet/govet_test.go

@@ -18,7 +18,7 @@ import (
 
 func TestGovet(t *testing.T) {
 	// Checking that every default analyzer is in "all analyzers" list.
-	checkList := append([]*analysis.Analyzer{}, defaultAnalyzers...)
+	checkList := slices.Clone(defaultAnalyzers)
 	checkList = append(checkList, shadow.Analyzer) // special case, used in analyzersFromConfig
 
 	for _, defaultAnalyzer := range checkList {

pkg/golinters/tagliatelle/tagliatelle.go

@@ -1,6 +1,8 @@
 package tagliatelle
 
 import (
+	"maps"
+
 	"github.com/ldez/tagliatelle"
 
 	"github.com/golangci/golangci-lint/v2/pkg/config"
@@ -19,9 +21,7 @@ func New(settings *config.TagliatelleSettings) *goanalysis.Linter {
 	}
 
 	if settings != nil {
-		for k, v := range settings.Case.Rules {
-			cfg.Rules[k] = v
-		}
+		maps.Copy(cfg.Rules, settings.Case.Rules)
 
 		cfg.ExtendedRules = toExtendedRules(settings.Case.ExtendedRules)
 		cfg.UseFieldName = settings.Case.UseFieldName

pkg/report/log.go

@@ -2,6 +2,7 @@ package report
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/golangci/golangci-lint/v2/pkg/logutils"
@@ -50,7 +51,7 @@ func (lw LogWrapper) Infof(format string, args ...any) {
 func (lw LogWrapper) Child(name string) logutils.Log {
 	c := lw
 	c.origLog = lw.origLog.Child(name)
-	c.tags = append([]string{}, lw.tags...)
+	c.tags = slices.Clone(lw.tags)
 	c.tags = append(c.tags, name)
 	return c
 }

pkg/result/processors/base_rule.go

@@ -2,6 +2,7 @@ package processors
 
 import (
 	"regexp"
+	"slices"
 
 	"github.com/golangci/golangci-lint/v2/pkg/config"
 	"github.com/golangci/golangci-lint/v2/pkg/fsutils"
@@ -73,13 +74,7 @@ func (r *baseRule) match(issue *result.Issue, lines *fsutils.LineCache, log logu
 }
 
 func (r *baseRule) matchLinter(issue *result.Issue) bool {
-	for _, linter := range r.linters {
-		if linter == issue.FromLinter {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(r.linters, issue.FromLinter)
 }
 
 func (r *baseRule) matchSource(issue *result.Issue, lineCache *fsutils.LineCache, log logutils.Log) bool {

pkg/result/processors/nolint_filter.go

@@ -185,8 +185,7 @@ func (p *NolintFilter) buildIgnoredRangesForFile(f *ast.File, fset *token.FileSe
 	ast.Walk(&e, f)
 
 	// TODO: merge all ranges: there are repeated ranges
-	allRanges := append([]ignoredRange{}, inlineRanges...)
-	allRanges = append(allRanges, e.expandedRanges...)
+	allRanges := slices.Concat(inlineRanges, e.expandedRanges)
 
 	return allRanges
 }

test/testshared/integration/run.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -70,7 +71,7 @@ func testOneSource(t *testing.T, log *logutils.StderrLog, binPath, sourcePath st
 	}
 
 	for _, addArg := range []string{"", "-Etypecheck"} {
-		caseArgs := append([]string{}, args...)
+		caseArgs := slices.Clone(args)
 
 		if addArg != "" {
 			caseArgs = append(caseArgs, addArg)

test/testshared/runner.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
@@ -286,10 +287,8 @@ func (r *RunnerResult) ExpectNoIssues() {
 func (r *RunnerResult) ExpectExitCode(possibleCodes ...int) *RunnerResult {
 	r.tb.Helper()
 
-	for _, pc := range possibleCodes {
-		if pc == r.exitCode {
-			return r
-		}
+	if slices.Contains(possibleCodes, r.exitCode) {
+		return r
 	}
 
 	assert.Fail(r.tb, "invalid exit code", "exit code (%d) must be one of %v: %s", r.exitCode, possibleCodes, r.output)