From 42723c84f4fb16023986eac7a01d5084bb7412d8 Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Wed, 8 Jan 2025 10:46:31 +0100
Subject: [PATCH] chore: bump golangci-lint and fix config

This fixes the CI lint step. No change in code except a fix
in test output.
---
 .golangci.yml              | 32 +++++++++++---------------------
 interp/interp_eval_test.go |  4 ++--
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index bfd41212..a2d12b2f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,7 +4,7 @@ run:
 
 linters-settings:
   govet:
-    check-shadowing: false
+    shadow: false
   gocyclo:
     min-complexity: 12
   maligned:
@@ -92,22 +92,8 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - deadcode # deprecated
-    - exhaustivestruct # deprecated
-    - golint # deprecated
-    - ifshort # deprecated
-    - interfacer # deprecated
-    - maligned # deprecated
-    - nosnakecase # deprecated
-    - scopelint # deprecated
-    - structcheck # deprecated
-    - varcheck # deprecated
-    - cyclop # duplicate of gocyclo
-    - sqlclosecheck # not relevant (SQL)
-    - rowserrcheck # not relevant (SQL)
-    - execinquery # not relevant (SQL)
     - lll
-    - gas
+    - gosec
     - dupl
     - prealloc
     - gocyclo
@@ -120,25 +106,29 @@ linters:
     - funlen
     - gocognit
     - stylecheck
-    - gomnd
+    - mnd
     - testpackage
     - paralleltest
     - tparallel
-    - goerr113
+    - err113
     - wrapcheck
     - nestif
     - exhaustive
     - exhaustruct
     - forbidigo
-    - ifshort
     - forcetypeassert
     - varnamelen
-    - nosnakecase
     - nonamedreturns
     - nilnil
     - maintidx
     - dupword # false positives
-    - errorlint # TODO: must be reactivate after fixes
+    - errorlint   # TODO: enable after fixes
+    - errcheck    # TODO: enable after fixes
+    - revive      # TODO: enable after fixes
+    - fatcontext  # TODO: enable after fixes
+    - gocritic    # TODO: enable after fixes
+    - predeclared # TODO: enable after fixes
+    - recvcheck   # TODO: enable after fixes
 
 issues:
   exclude-use-default: false
diff --git a/interp/interp_eval_test.go b/interp/interp_eval_test.go
index 63f01553..1a8fc680 100644
--- a/interp/interp_eval_test.go
+++ b/interp/interp_eval_test.go
@@ -900,7 +900,7 @@ func eval(t *testing.T, i *interp.Interpreter, src string) reflect.Value {
 	if err != nil {
 		t.Logf("Error: %v", err)
 		if e, ok := err.(interp.Panic); ok {
-			t.Logf(string(e.Stack))
+			t.Log(string(e.Stack))
 		}
 		t.FailNow()
 	}
@@ -922,7 +922,7 @@ func assertEval(t *testing.T, i *interp.Interpreter, src, expectedError, expecte
 	if err != nil {
 		t.Logf("got an error: %v", err)
 		if e, ok := err.(interp.Panic); ok {
-			t.Logf(string(e.Stack))
+			t.Log(string(e.Stack))
 		}
 		t.FailNow()
 	}