Update golangci-lint to v2.8.0 and fix linting issues (#986)

* Update golangci-lint to v2.8.0 and fix linting issues

* Fix golangci-lint installation by using v2 module path

Author: aalexand

.github/workflows/ci.yaml

@@ -96,7 +96,7 @@ jobs:
           # Do not let tools interfere with the main module's go.mod.
           cd && go mod init tools
           go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7
+          go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.8.0
           # Add PATH for installed tools.
           echo "$GOPATH/bin:$PATH" >> $GITHUB_PATH
 
@@ -189,7 +189,7 @@ jobs:
           # Do not let tools interfere with the main module's go.mod.
           cd && go mod init tools
           go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7
+          go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.8.0
           # Add PATH for installed tools.
           echo "$GOPATH/bin:$PATH" >> $GITHUB_PATH
 

internal/binutils/binutils_test.go

@@ -272,7 +272,7 @@ func skipUnlessWindowsAmd64(t *testing.T) {
 
 func testDisasm(t *testing.T, intelSyntax bool) {
 	_, llvmObjdump, buObjdump := findObjdump([]string{""})
-	if !(llvmObjdump || buObjdump) {
+	if !llvmObjdump && !buObjdump {
 		t.Skip("cannot disasm: no objdump tool available")
 	}
 

internal/driver/driver_test.go

@@ -195,11 +195,11 @@ func TestParse(t *testing.T) {
 			if runtime.GOOS == "windows" {
 				if flags[0] == "dot" {
 					// The .dot test has the paths inside strings, so \ must be escaped.
-					sbuf = bytes.Replace(sbuf, []byte("testdata/"), []byte(`testdata\\`), -1)
-					sbuf = bytes.Replace(sbuf, []byte("/path/to/"), []byte(`\\path\\to\\`), -1)
+					sbuf = bytes.ReplaceAll(sbuf, []byte("testdata/"), []byte(`testdata\\`))
+					sbuf = bytes.ReplaceAll(sbuf, []byte("/path/to/"), []byte(`\\path\\to\\`))
 				} else {
-					sbuf = bytes.Replace(sbuf, []byte("testdata/"), []byte(`testdata\`), -1)
-					sbuf = bytes.Replace(sbuf, []byte("/path/to/"), []byte(`\path\to\`), -1)
+					sbuf = bytes.ReplaceAll(sbuf, []byte("testdata/"), []byte(`testdata\`))
+					sbuf = bytes.ReplaceAll(sbuf, []byte("/path/to/"), []byte(`\path\to\`))
 				}
 			}
 

internal/driver/settings.go

@@ -90,7 +90,7 @@ func configMenu(fname string, u url.URL) []configMenuEntry {
 	result := make([]configMenuEntry, len(configs))
 	lastMatch := -1
 	for i, cfg := range configs {
-		dst, changed := cfg.config.makeURL(u)
+		dst, changed := cfg.makeURL(u)
 		if !changed {
 			lastMatch = i
 		}

internal/driver/svg.go

@@ -33,7 +33,7 @@ var (
 func massageSVG(svg string) string {
 	// Work around for dot bug which misses quoting some ampersands,
 	// resulting on unparsable SVG.
-	svg = strings.Replace(svg, "&;", "&;", -1)
+	svg = strings.ReplaceAll(svg, "&;", "&;")
 
 	// Dot's SVG output is
 	//

internal/driver/webui.go

@@ -353,7 +353,7 @@ func dotToSvg(dot []byte) ([]byte, error) {
 	}
 
 	// Fix dot bug related to unquoted ampersands.
-	svg := bytes.Replace(out.Bytes(), []byte("&;"), []byte("&;"), -1)
+	svg := bytes.ReplaceAll(out.Bytes(), []byte("&;"), []byte("&;"))
 
 	// Cleanup for embedding by dropping stuff before the <svg> start.
 	if pos := bytes.Index(svg, []byte("<svg")); pos >= 0 {

internal/graph/dotgraph.go

@@ -384,11 +384,11 @@ func dotColor(score float64, isBackground bool) string {
 func multilinePrintableName(info *NodeInfo) string {
 	infoCopy := *info
 	infoCopy.Name = escapeForDot(ShortenFunctionName(infoCopy.Name))
-	infoCopy.Name = strings.Replace(infoCopy.Name, "::", `\n`, -1)
+	infoCopy.Name = strings.ReplaceAll(infoCopy.Name, "::", `\n`)
 	// Go type parameters are reported as "[...]" by Go pprof profiles.
 	// Keep this ellipsis rather than replacing with newlines below.
-	infoCopy.Name = strings.Replace(infoCopy.Name, "[...]", "[…]", -1)
-	infoCopy.Name = strings.Replace(infoCopy.Name, ".", `\n`, -1)
+	infoCopy.Name = strings.ReplaceAll(infoCopy.Name, "[...]", "[…]")
+	infoCopy.Name = strings.ReplaceAll(infoCopy.Name, ".", `\n`)
 	if infoCopy.File != "" {
 		infoCopy.File = filepath.Base(infoCopy.File)
 	}

internal/report/report.go

@@ -535,7 +535,7 @@ func symbolsFromBinaries(prof *profile.Profile, g *graph.Graph, rx *regexp.Regex
 		// the regexp (unless the regexp is an address and the mapping's range covers
 		// the address)
 		if !fileHasSamplesAndMatched[m.File] {
-			if address == nil || !(m.Start <= *address && *address <= m.Limit) {
+			if address == nil || m.Start > *address || *address > m.Limit {
 				continue
 			}
 		}

internal/report/report_test.go

@@ -87,9 +87,9 @@ func TestSource(t *testing.T) {
 		if runtime.GOOS == "windows" {
 			if tc.rpt.options.OutputFormat == Dot {
 				// The .dot test has the paths inside strings, so \ must be escaped.
-				gold = bytes.Replace(gold, []byte("testdata/"), []byte(`testdata\\`), -1)
+				gold = bytes.ReplaceAll(gold, []byte("testdata/"), []byte(`testdata\\`))
 			} else {
-				gold = bytes.Replace(gold, []byte("testdata/"), []byte(`testdata\`), -1)
+				gold = bytes.ReplaceAll(gold, []byte("testdata/"), []byte(`testdata\`))
 			}
 		}
 		if string(b.String()) != string(gold) {

internal/report/source.go

@@ -1066,15 +1066,16 @@ func trimPath(path, trimPath, searchPath string) string {
 func indentation(line string) int {
 	column := 0
 	for _, c := range line {
-		if c == ' ' {
+		switch c {
+		case ' ':
 			column++
-		} else if c == '\t' {
+		case '\t':
 			column++
 			for column%8 != 0 {
 				column++
 			}
-		} else {
-			break
+		default:
+			return column
 		}
 	}
 	return column