update golangci-lint

Author: gaissmai

.github/workflows/go.yml

@@ -73,4 +73,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:
-          version: latest
+          version: v2.6.0

.golangci.yml

@@ -21,6 +21,8 @@ linters:
     - copyloopvar
     - tparallel
     - gochecknoglobals
+    - nolintlint
+    - modernize
   settings:
     govet:
       enable:

internal/nodes/nodebasics_test.go

@@ -737,6 +737,7 @@ func TestLeafNode_CloneLeaf(t *testing.T) {
 
 		if cloned == nil {
 			t.Fatal("CloneLeaf should return non-nil for non-nil receiver")
+			return // redundant, but staticcheck is otherweise confused
 		}
 		if cloned.Prefix != pfx {
 			t.Error("CloneLeaf should preserve Prefix")
@@ -766,6 +767,7 @@ func TestLeafNode_CloneLeaf(t *testing.T) {
 
 		if cloned == nil {
 			t.Fatal("CloneLeaf should return non-nil")
+			return // redundant, but staticcheck is otherweise confused
 		}
 		if cloned.Prefix != pfx {
 			t.Error("CloneLeaf should preserve Prefix")
@@ -797,6 +799,7 @@ func TestFringeNode_CloneFringe(t *testing.T) {
 
 		if cloned == nil {
 			t.Fatal("CloneFringe should return non-nil for non-nil receiver")
+			return // redundant, but staticcheck is otherweise confused
 		}
 		if cloned.Value != 42 {
 			t.Error("CloneFringe should preserve Value with nil cloneFn")
@@ -822,6 +825,7 @@ func TestFringeNode_CloneFringe(t *testing.T) {
 
 		if cloned == nil {
 			t.Fatal("CloneFringe should return non-nil")
+			return // redundant, but staticcheck is otherweise confused
 		}
 		if cloned.Value.Str != "hello_cloned" {
 			t.Errorf("CloneFringe should apply cloneFn, got %q, want %q", cloned.Value.Str, "hello_cloned")

internal/value/value_test.go

@@ -330,7 +330,7 @@ func TestCloneVal_TypedNil(t *testing.T) {
 
 	t.Run("interface_with_typed_nil", func(t *testing.T) {
 		t.Parallel()
-		var i interface{} = (*int)(nil)
+		var i any = (*int)(nil)
 		cloned := CloneVal(i)
 
 		if cloned != i {
@@ -434,7 +434,7 @@ func TestCopyVal_TypedNil(t *testing.T) {
 
 	t.Run("interface_with_typed_nil", func(t *testing.T) {
 		t.Parallel()
-		var i interface{} = (*int)(nil)
+		var i any = (*int)(nil)
 		copied := CopyVal(i)
 
 		// CopyVal is a value copy, so interface contents are copied