review

Author: ldez

pkg/config/loader.go

@@ -285,7 +285,9 @@ func (l *Loader) appendStringSlice(name string, current *[]string) {
 }
 
 func (l *Loader) handleGoVersion() {
-	l.cfg.Run.Go = cmp.Or(l.cfg.Run.Go, detectGoVersion())
+	if l.cfg.Run.Go == "" {
+		l.cfg.Run.Go = detectGoVersion()
+	}
 
 	l.cfg.LintersSettings.Govet.Go = l.cfg.Run.Go
 

pkg/goanalysis/pkgerrors/extract.go

@@ -1,7 +1,6 @@
 package pkgerrors
 
 import (
-	"cmp"
 	"fmt"
 	"regexp"
 	"strings"
@@ -51,7 +50,9 @@ func extractErrors(pkg *packages.Package) []packages.Error {
 		// some errors like "code in directory  expects import" don't have Pos, set it here
 		for i := range uniqErrors {
 			err := &uniqErrors[i]
-			err.Pos = cmp.Or(err.Pos, fmt.Sprintf("%s:1", pkg.GoFiles[0]))
+			if err.Pos == "" {
+				err.Pos = fmt.Sprintf("%s:1", pkg.GoFiles[0])
+			}
 		}
 	}
 

pkg/goanalysis/runners.go

@@ -1,7 +1,6 @@
 package goanalysis
 
 import (
-	"cmp"
 	"fmt"
 
 	"golang.org/x/tools/go/analysis"
@@ -60,7 +59,9 @@ func runAnalyzers(cfg runAnalyzersConfig, lintCtx *linter.Context) ([]result.Iss
 		reportedIssues := cfg.reportIssues(lintCtx)
 		for i := range reportedIssues {
 			issue := &reportedIssues[i].Issue
-			issue.Pkg = cmp.Or(issue.Pkg, passToPkg[reportedIssues[i].Pass])
+			if issue.Pkg == nil {
+				issue.Pkg = passToPkg[reportedIssues[i].Pass]
+			}
 			retIssues = append(retIssues, *issue)
 		}
 		retIssues = append(retIssues, buildIssues(diags, cfg.getLinterNameForDiagnostic)...)

pkg/goutil/env.go

@@ -1,7 +1,6 @@
 package goutil
 
 import (
-	"cmp"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -55,5 +54,10 @@ func (e Env) Discover(ctx context.Context) error {
 }
 
 func (e Env) Get(k EnvKey) string {
-	return cmp.Or(os.Getenv(string(k)), e.vars[string(k)])
+	envValue := os.Getenv(string(k))
+	if envValue != "" {
+		return envValue
+	}
+
+	return e.vars[string(k)]
 }

pkg/lint/lintersdb/manager.go

@@ -1,7 +1,6 @@
 package lintersdb
 
 import (
-	"cmp"
 	"fmt"
 	"os"
 	"slices"
@@ -41,7 +40,10 @@ func NewManager(log logutils.Log, cfg *config.Config, builders ...Builder) (*Man
 		nameToLCs: make(map[string][]*linter.Config),
 	}
 
-	m.cfg = cmp.Or(cfg, config.NewDefault())
+	m.cfg = cfg
+	if cfg == nil {
+		m.cfg = config.NewDefault()
+	}
 
 	for _, builder := range builders {
 		linters, err := builder.Build(m.cfg)

pkg/lint/runner.go

@@ -1,7 +1,6 @@
 package lint
 
 import (
-	"cmp"
 	"context"
 	"errors"
 	"fmt"
@@ -165,7 +164,9 @@ func (r *Runner) runLinterSafe(ctx context.Context, lintCtx *linter.Context,
 	}
 
 	for i := range issues {
-		issues[i].FromLinter = cmp.Or(issues[i].FromLinter, lc.Name())
+		if issues[i].FromLinter == "" {
+			issues[i].FromLinter = lc.Name()
+		}
 	}
 
 	return issues, nil

test/bench/bench_test.go

@@ -2,7 +2,6 @@ package bench
 
 import (
 	"bytes"
-	"cmp"
 	"errors"
 	"fmt"
 	"go/build"
@@ -134,7 +133,10 @@ func Benchmark_golangciLint(b *testing.B) {
 func getAllRepositories(tb testing.TB) []repo {
 	tb.Helper()
 
-	benchRoot := cmp.Or(os.Getenv("GCL_BENCH_ROOT"), tb.TempDir())
+	benchRoot := os.Getenv("GCL_BENCH_ROOT")
+	if benchRoot == "" {
+		benchRoot = tb.TempDir()
+	}
 
 	return []repo{
 		{