golangci-lint

.github/workflows/golangci-lint.yml

@@ -12,7 +12,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: latest
+          version: v1.59
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.golangci.yml

@@ -55,7 +55,6 @@ linters-settings:
       - builtinShadow
       - commentedOutCode
       - octalLiteral
-      - sloppyTestFuncName
       - unnamedResult
       - whyNoLint
       - yodaStyleExpr
@@ -72,9 +71,10 @@ linters:
     - gochecknoglobals
     - gochecknoinits
     - godox
-    - goerr113
+    - err113
     - golint
     - gomnd
+    - mnd
     - nakedret
     - nlreturn
     - nonamedreturns

location_stack_test.go

@@ -2,14 +2,14 @@ package loc
 
 import (
 	"fmt"
-	"path"
 	"regexp"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
+// align line numbers for tests
+
 func TestLocationFillCallers(t *testing.T) {
 	st := make(PCs, 1)
 
@@ -95,34 +95,3 @@ at [\w.-/]*location_stack_test.go:78
 	v := st.FormatString("+")
 	assert.True(t, regexp.MustCompile(re).MatchString(v), "expected:\n%vgot:\n%v", re, v)
 }
-
-func innerFuncName(fn PC, n int) string {
-	var s string
-
-	switch {
-	//	case regexp.MustCompile("go1.16.*").MatchString(gover()):
-	//		return ".func1"
-	case regexp.MustCompile("go1.21.*").MatchString(gover()):
-		name, _, _ := fn.NameFileLine()
-		name = path.Base(name)
-		name = name[strings.IndexByte(name, '.')+1:]
-
-		s = "." + name
-
-		for i := 0; i < n; i++ {
-			s += fmt.Sprintf(".func%v", i+1)
-		}
-	default:
-		s = ".func"
-
-		for i := 0; i < n; i++ {
-			if i != 0 {
-				s += "."
-			}
-
-			s += "1"
-		}
-	}
-
-	return s
-}

runtime_test.go

@@ -102,7 +102,3 @@ func BenchmarkRuntimeCallerFileLine(b *testing.B) {
 		b.Errorf("not ok")
 	}
 }
-
-func gover() string {
-	return runtime.Version()
-}

unsafe.go

@@ -1,6 +1,6 @@
 package loc
 
-import _ "unsafe"
+import _ "unsafe" // for linkname
 
 //go:noescape
 //go:linkname callers runtime.callers