chore: use new language elements

ldez · ldez · commit 552255db4f0d · 2025-08-12T23:21:24.000+02:00
diff --git a/pkg/commands/internal/migrate/versionone/output.go b/pkg/commands/internal/migrate/versionone/output.go
@@ -24,9 +24,7 @@ type OutputFormat struct {
 type OutputFormats []OutputFormat
 
 func (p *OutputFormats) UnmarshalText(text []byte) error {
-	formats := strings.Split(string(text), ",")
-
-	for _, item := range formats {
+	for item := range strings.SplitSeq(string(text), ",") {
 		format, path, _ := strings.Cut(item, ":")
 
 		*p = append(*p, OutputFormat{
diff --git a/pkg/goformatters/gci/internal/section/standard_list.go b/pkg/goformatters/gci/internal/section/standard_list.go
diff --git a/pkg/golinters/dogsled/dogsled.go b/pkg/golinters/dogsled/dogsled.go
@@ -30,18 +30,14 @@ func run(pass *analysis.Pass, maxBlanks int) (any, error) {
 		return nil, nil
 	}
 
-	nodeFilter := []ast.Node{
-		(*ast.FuncDecl)(nil),
-	}
-
-	insp.Preorder(nodeFilter, func(node ast.Node) {
+	for node := range insp.PreorderSeq((*ast.FuncDecl)(nil)) {
 		funcDecl, ok := node.(*ast.FuncDecl)
 		if !ok {
-			return
+			continue
 		}
 
 		if funcDecl.Body == nil {
-			return
+			continue
 		}
 
 		for _, expr := range funcDecl.Body.List {
@@ -65,7 +61,7 @@ func run(pass *analysis.Pass, maxBlanks int) (any, error) {
 				pass.Reportf(assgnStmt.Pos(), "declaration has %v blank identifiers", numBlank)
 			}
 		}
-	})
+	}
 
 	return nil, nil
 }
diff --git a/pkg/golinters/gochecknoinits/gochecknoinits.go b/pkg/golinters/gochecknoinits/gochecknoinits.go
@@ -28,21 +28,17 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, nil
 	}
 
-	nodeFilter := []ast.Node{
-		(*ast.FuncDecl)(nil),
-	}
-
-	insp.Preorder(nodeFilter, func(decl ast.Node) {
-		funcDecl, ok := decl.(*ast.FuncDecl)
+	for node := range insp.PreorderSeq((*ast.FuncDecl)(nil)) {
+		funcDecl, ok := node.(*ast.FuncDecl)
 		if !ok {
-			return
+			continue
 		}
 
 		fnName := funcDecl.Name.Name
 		if fnName == "init" && funcDecl.Recv.NumFields() == 0 {
 			pass.Reportf(funcDecl.Pos(), "don't use %s function", internal.FormatCode(fnName))
 		}
-	})
+	}
 
 	return nil, nil
 }
diff --git a/pkg/goutil/version.go b/pkg/goutil/version.go
@@ -60,9 +60,7 @@ func CleanRuntimeVersion() (string, error) {
 }
 
 func cleanRuntimeVersion(rv string) (string, error) {
-	parts := strings.Fields(rv)
-
-	for _, part := range parts {
+	for part := range strings.FieldsSeq(rv) {
 		// Allow to handle:
 		// - GOEXPERIMENT -> "go1.23.0 X:boringcrypto"
 		// - devel -> "devel go1.24-e705a2d Wed Aug 7 01:16:42 2024 +0000 linux/amd64"
diff --git a/pkg/logutils/logutils.go b/pkg/logutils/logutils.go
@@ -94,7 +94,7 @@ func getEnabledDebugs() map[string]bool {
 		return ret
 	}
 
-	for _, tag := range strings.Split(debugVar, ",") {
+	for tag := range strings.SplitSeq(debugVar, ",") {
 		ret[tag] = true
 	}
 
diff --git a/pkg/result/processors/nolint_filter.go b/pkg/result/processors/nolint_filter.go
@@ -227,11 +227,12 @@ func (p *NolintFilter) extractInlineRangeFromComment(text string, g ast.Node, fs
 		return buildRange(nil) // ignore all linters
 	}
 
+	text, _, _ = strings.Cut(text, "//") // allow another comment after this comment
+
 	// ignore specific linters
 	var linters []string
-	text = strings.Split(text, "//")[0] // allow another comment after this comment
-	linterItems := strings.Split(strings.TrimPrefix(text, "nolint:"), ",")
-	for _, item := range linterItems {
+
+	for item := range strings.SplitSeq(strings.TrimPrefix(text, "nolint:"), ",") {
 		linterName := strings.ToLower(strings.TrimSpace(item))
 		if linterName == "all" {
 			p.unknownLintersSet = map[string]bool{}
diff --git a/scripts/gen_github_action_config/main.go b/scripts/gen_github_action_config/main.go
@@ -219,10 +219,9 @@ func parseVersion(s string) (*version, error) {
 		return nil, fmt.Errorf("version %q should start with %q", s, vPrefix)
 	}
 
-	parts := strings.Split(strings.TrimPrefix(s, vPrefix), ".")
-
 	var nums []int
-	for _, part := range parts {
+
+	for part := range strings.SplitSeq(strings.TrimPrefix(s, vPrefix), ".") {
 		num, err := strconv.Atoi(part)
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse version %q: %w", s, err)
diff --git a/scripts/website/expand_templates/changelog.go b/scripts/website/expand_templates/changelog.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bufio"
 	"bytes"
 	"os"
 	"path/filepath"
@@ -24,13 +23,7 @@ func copyChangelog(dir string) error {
 
 	var write bool
 
-	// TODO(ldez): use bytes.Lines when min go1.24 (and remove the new line)
-	scanner := bufio.NewScanner(bytes.NewBuffer(bytes.ReplaceAll(in, []byte("### "), []byte("## "))))
-	scanner.Split(bufio.ScanLines)
-
-	for scanner.Scan() {
-		line := scanner.Bytes()
-
+	for line := range bytes.Lines(bytes.ReplaceAll(in, []byte("### "), []byte("## "))) {
 		if bytes.Equal(bytes.TrimSpace(line), []byte(marker)) {
 			write = true
 			continue
@@ -40,8 +33,6 @@ func copyChangelog(dir string) error {
 			continue
 		}
 
-		line = append(line, '\n')
-
 		_, err = out.Write(line)
 		if err != nil {
 			return err
diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go
@@ -2,7 +2,6 @@ package bench
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"go/build"
@@ -36,15 +35,6 @@ type metrics struct {
 }
 
 func Benchmark_linters(b *testing.B) {
-	savedWD, err := os.Getwd()
-	require.NoError(b, err)
-
-	b.Cleanup(func() {
-		// Restore WD to avoid side effects when during all the benchmarks.
-		err = os.Chdir(savedWD)
-		require.NoError(b, err)
-	})
-
 	installGolangCILint(b)
 
 	repos := getAllRepositories(b)
@@ -64,11 +54,9 @@ func Benchmark_linters(b *testing.B) {
 
 			for _, repo := range repos {
 				b.Run(repo.name, func(b *testing.B) {
-					// TODO(ldez): clean inside go1.25 PR
-					_ = exec.CommandContext(context.Background(), binName, "cache", "clean").Run()
+					_ = exec.CommandContext(b.Context(), binName, "cache", "clean").Run()
 
-					err = os.Chdir(repo.dir)
-					require.NoErrorf(b, err, "can't chdir to %s", repo.dir)
+					b.Chdir(repo.dir)
 
 					lc := countGoLines(b)
 
@@ -85,19 +73,9 @@ func Benchmark_linters(b *testing.B) {
 }
 
 func Benchmark_golangciLint(b *testing.B) {
-	savedWD, err := os.Getwd()
-	require.NoError(b, err)
-
-	b.Cleanup(func() {
-		// Restore WD to avoid side effects when during all the benchmarks.
-		err = os.Chdir(savedWD)
-		require.NoError(b, err)
-	})
-
 	installGolangCILint(b)
 
-	// TODO(ldez): clean inside go1.25 PR
-	_ = exec.CommandContext(context.Background(), binName, "cache", "clean").Run()
+	_ = exec.CommandContext(b.Context(), binName, "cache", "clean").Run()
 
 	cases := getAllRepositories(b)
 
@@ -117,8 +95,7 @@ func Benchmark_golangciLint(b *testing.B) {
 
 	for _, c := range cases {
 		b.Run(c.name, func(b *testing.B) {
-			err = os.Chdir(c.dir)
-			require.NoErrorf(b, err, "can't chdir to %s", c.dir)
+			b.Chdir(c.dir)
 
 			lc := countGoLines(b)
 
@@ -145,26 +122,26 @@ func getAllRepositories(tb testing.TB) []repo {
 			name: "golangci/golangci-lint",
 			dir:  cloneGithubProject(tb, benchRoot, "golangci", "golangci-lint"),
 		},
-		{
-			name: "goreleaser/goreleaser",
-			dir:  cloneGithubProject(tb, benchRoot, "goreleaser", "goreleaser"),
-		},
-		{
-			name: "gohugoio/hugo",
-			dir:  cloneGithubProject(tb, benchRoot, "gohugoio", "hugo"),
-		},
-		{
-			name: "pact-foundation/pact-go", // CGO inside
-			dir:  cloneGithubProject(tb, benchRoot, "pact-foundation", "pact-go"),
-		},
-		{
-			name: "kubernetes/kubernetes",
-			dir:  cloneGithubProject(tb, benchRoot, "kubernetes", "kubernetes"),
-		},
-		{
-			name: "moby/buildkit",
-			dir:  cloneGithubProject(tb, benchRoot, "moby", "buildkit"),
-		},
+		// {
+		// 	name: "goreleaser/goreleaser",
+		// 	dir:  cloneGithubProject(tb, benchRoot, "goreleaser", "goreleaser"),
+		// },
+		// {
+		// 	name: "gohugoio/hugo",
+		// 	dir:  cloneGithubProject(tb, benchRoot, "gohugoio", "hugo"),
+		// },
+		// {
+		// 	name: "pact-foundation/pact-go", // CGO inside
+		// 	dir:  cloneGithubProject(tb, benchRoot, "pact-foundation", "pact-go"),
+		// },
+		// {
+		// 	name: "kubernetes/kubernetes",
+		// 	dir:  cloneGithubProject(tb, benchRoot, "kubernetes", "kubernetes"),
+		// },
+		// {
+		// 	name: "moby/buildkit",
+		// 	dir:  cloneGithubProject(tb, benchRoot, "moby", "buildkit"),
+		// },
 		{
 			name: "go source code",
 			dir:  filepath.Join(build.Default.GOROOT, "src"),
@@ -180,8 +157,7 @@ func cloneGithubProject(tb testing.TB, benchRoot, owner, name string) string {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		repo := fmt.Sprintf("https://github.com/%s/%s.git", owner, name)
 
-		// TODO(ldez): clean inside go1.25 PR
-		err = exec.CommandContext(context.Background(), "git", "clone", "--depth", "1", "--single-branch", repo, dir).Run()
+		err = exec.CommandContext(tb.Context(), "git", "clone", "--depth", "1", "--single-branch", repo, dir).Run()
 		if err != nil {
 			tb.Fatalf("can't git clone %s/%s: %s", owner, name, err)
 		}
@@ -214,8 +190,7 @@ func launch(tb testing.TB, run func(testing.TB, string, []string), args []string
 func run(tb testing.TB, name string, args []string) {
 	tb.Helper()
 
-	// TODO(ldez): clean inside go1.25 PR
-	cmd := exec.CommandContext(context.Background(), name, args...)
+	cmd := exec.CommandContext(tb.Context(), name, args...)
 	if os.Getenv("PRINT_CMD") == "1" {
 		log.Print(strings.Join(cmd.Args, " "))
 	}
@@ -233,18 +208,17 @@ func run(tb testing.TB, name string, args []string) {
 func countGoLines(tb testing.TB) int {
 	tb.Helper()
 
-	// TODO(ldez): clean inside go1.25 PR
-	cmd := exec.CommandContext(context.Background(), "bash", "-c", `find . -type f -name "*.go" |  grep -F -v vendor | xargs wc -l | tail -1`)
+	cmd := exec.CommandContext(tb.Context(), "bash", "-c", `find . -type f -name "*.go" |  grep -F -v vendor | xargs wc -l | tail -1`)
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		tb.Log(string(out))
 		tb.Fatalf("can't run go lines counter: %s", err)
 	}
 
-	parts := bytes.Split(bytes.TrimSpace(out), []byte(" "))
+	lineCount, _, _ := bytes.Cut(bytes.TrimSpace(out), []byte(" "))
 
-	n, err := strconv.Atoi(string(parts[0]))
+	n, err := strconv.Atoi(string(lineCount))
 	if err != nil {
 		tb.Log(string(out))
 		tb.Fatalf("can't parse go lines count: %s", err)
@@ -347,8 +321,7 @@ func installGolangCILint(tb testing.TB) {
 
 	parentPath := findMakefile(tb)
 
-	// TODO(ldez): clean inside go1.25 PR
-	cmd := exec.CommandContext(context.Background(), "make", "-C", parentPath, "build")
+	cmd := exec.CommandContext(tb.Context(), "make", "-C", parentPath, "build")
 
 	output, err := cmd.CombinedOutput()
 	if err != nil {
@@ -399,7 +372,14 @@ func getLinterNames(tb testing.TB, fastOnly bool) []string {
 	tb.Helper()
 
 	// add linter names here if needed.
-	var excluded []string
+	excluded := []string{
+		"gci",       // Formatter
+		"gofmt",     // Formatter
+		"gofumpt",   // Formatter
+		"goimports", // Formatter
+		"golines",   // Formatter
+		"swaggo",    // Formatter
+	}
 
 	linters, err := lintersdb.NewLinterBuilder().Build(config.NewDefault())
 	require.NoError(tb, err)
@@ -410,6 +390,10 @@ func getLinterNames(tb testing.TB, fastOnly bool) []string {
 			continue
 		}
 
+		if lc.Internal {
+			continue
+		}
+
 		if fastOnly && lc.IsSlowLinter() {
 			continue
 		}
diff --git a/test/testshared/install.go b/test/testshared/install.go
@@ -1,7 +1,6 @@
 package testshared
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"os"
@@ -49,8 +48,7 @@ func InstallGolangciLint(tb testing.TB) string {
 		defer builtLock.Unlock()
 
 		if !built {
-			// TODO(ldez): clean inside go1.25 PR
-			cmd := exec.CommandContext(context.Background(), "make", "-C", parentPath, "build")
+			cmd := exec.CommandContext(tb.Context(), "make", "-C", parentPath, "build")
 
 			output, err := cmd.CombinedOutput()
 			require.NoError(tb, err, "can't install golangci-lint %s", string(output))
diff --git a/test/testshared/integration/fix.go b/test/testshared/integration/fix.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"context"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -31,8 +30,7 @@ func setupTestFix(t *testing.T) []string {
 
 	sourcesDir := filepath.Join(testdataDir, "fix")
 
-	// TODO(ldez): clean inside go1.25 PR
-	err := exec.CommandContext(context.Background(), "cp", "-R", sourcesDir, tmpDir).Run()
+	err := exec.CommandContext(t.Context(), "cp", "-R", sourcesDir, tmpDir).Run()
 	require.NoError(t, err)
 
 	return findSources(t, tmpDir, "in", "*.go")
diff --git a/test/testshared/integration/run.go b/test/testshared/integration/run.go
diff --git a/test/testshared/runner.go b/test/testshared/runner.go

Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,14 @@ func run(pass *analysis.Pass, maxBlanks int) (any, error) {`
`30`	`30`	`return nil, nil`
`31`	`31`	`}`
`32`	`32`
`33`		`- nodeFilter := []ast.Node{`
`34`		`- (*ast.FuncDecl)(nil),`
`35`		`- }`
`36`		`-`
`37`		`- insp.Preorder(nodeFilter, func(node ast.Node) {`
	`33`	`+ for node := range insp.PreorderSeq((*ast.FuncDecl)(nil)) {`
`38`	`34`	`funcDecl, ok := node.(*ast.FuncDecl)`
`39`	`35`	`if !ok {`
`40`		`- return`
	`36`	`+ continue`
`41`	`37`	`}`
`42`	`38`
`43`	`39`	`if funcDecl.Body == nil {`
`44`		`- return`
	`40`	`+ continue`
`45`	`41`	`}`
`46`	`42`
`47`	`43`	`for _, expr := range funcDecl.Body.List {`
`@@ -65,7 +61,7 @@ func run(pass *analysis.Pass, maxBlanks int) (any, error) {`
`65`	`61`	`pass.Reportf(assgnStmt.Pos(), "declaration has %v blank identifiers", numBlank)`
`66`	`62`	`}`
`67`	`63`	`}`
`68`		`- })`
	`64`	`+ }`
`69`	`65`
`70`	`66`	`return nil, nil`
`71`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,17 @@ func run(pass *analysis.Pass) (any, error) {`
`28`	`28`	`return nil, nil`
`29`	`29`	`}`
`30`	`30`
`31`		`- nodeFilter := []ast.Node{`
`32`		`- (*ast.FuncDecl)(nil),`
`33`		`- }`
`34`		`-`
`35`		`- insp.Preorder(nodeFilter, func(decl ast.Node) {`
`36`		`- funcDecl, ok := decl.(*ast.FuncDecl)`
	`31`	`+ for node := range insp.PreorderSeq((*ast.FuncDecl)(nil)) {`
	`32`	`+ funcDecl, ok := node.(*ast.FuncDecl)`
`37`	`33`	`if !ok {`
`38`		`- return`
	`34`	`+ continue`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`fnName := funcDecl.Name.Name`
`42`	`38`	`if fnName == "init" && funcDecl.Recv.NumFields() == 0 {`
`43`	`39`	`pass.Reportf(funcDecl.Pos(), "don't use %s function", internal.FormatCode(fnName))`
`44`	`40`	`}`
`45`		`- })`
	`41`	`+ }`
`46`	`42`
`47`	`43`	`return nil, nil`
`48`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func getEnabledDebugs() map[string]bool {`
`94`	`94`	`return ret`
`95`	`95`	`}`
`96`	`96`
`97`		`- for _, tag := range strings.Split(debugVar, ",") {`
	`97`	`+ for tag := range strings.SplitSeq(debugVar, ",") {`
`98`	`98`	`ret[tag] = true`
`99`	`99`	`}`
`100`	`100`