review

Author: ldez

pkg/goanalysis/pkgerrors/errors.go

@@ -1,7 +1,6 @@
 package pkgerrors
 
 import (
-	"cmp"
 	"errors"
 	"fmt"
 
@@ -28,7 +27,9 @@ func BuildIssuesFromIllTypedError(errs []error, lintCtx *linter.Context) ([]resu
 	for _, err := range errs {
 		var ill *IllTypedError
 		if !errors.As(err, &ill) {
-			other = cmp.Or(other, err)
+			if other == nil {
+				other = err
+			}
 			continue
 		}
 

pkg/result/processors/nolint.go

@@ -1,7 +1,6 @@
 package processors
 
 import (
-	"cmp"
 	"go/ast"
 	"go/parser"
 	"go/token"
@@ -286,7 +285,9 @@ func (e *rangeExpander) Visit(node ast.Node) ast.Visitor {
 
 	expandedRange := *foundRange
 	// store the original unexpanded range for matching nolintlint issues
-	expandedRange.originalRange = cmp.Or(expandedRange.originalRange, foundRange)
+	if expandedRange.originalRange == nil {
+		expandedRange.originalRange = foundRange
+	}
 	if expandedRange.To < nodeEndLine {
 		expandedRange.To = nodeEndLine
 	}