From 7b6d8532fd0706468bdf8e81eaca5c92545c0e1a Mon Sep 17 00:00:00 2001
From: Mattias Wadman <mattias.wadman@gmail.com>
Date: Thu, 12 Sep 2024 11:40:23 +0200
Subject: [PATCH] go,lint: Update to go 1.22 and fix some lint warnings

---
 .golangci.yml                 | 10 ++++++----
 README.md                     |  2 +-
 go.mod                        |  2 +-
 pkg/bitio/readwrite64_test.go |  1 -
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index f1dd11c8..a2e89739 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,7 +6,6 @@ linters:
         - errname
         - errorlint
         - exhaustive
-        - exportloopref
         - forcetypeassert
         - goimports
         - gosec
@@ -25,6 +24,7 @@ linters:
         - wastedassign
         - staticcheck
         - govet
+        - copyloopvar
 
 linters-settings:
     revive:
@@ -54,11 +54,13 @@ linters-settings:
     staticcheck:
         checks: ["all"]
 
-run:
-    timeout: 5m
-    skip-dirs:
+issues:
+    exclude-dirs:
         # allow md5
         - dev
         - doc
         # ignore warnings in code from crypto/tls and zmap/zcrypto
         - format/tls/tlsdecrypt
+
+run:
+    timeout: 5m
diff --git a/README.md b/README.md
index f86cba56..2c4ad944 100644
--- a/README.md
+++ b/README.md
@@ -244,7 +244,7 @@ apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing fq
 
 ### Build from source
 
-Make sure you have [go](https://go.dev) 1.21 or later installed.
+Make sure you have [go](https://go.dev) 1.22 or later installed.
 
 To install directly from git repository (no git clone needed):
 ```sh
diff --git a/go.mod b/go.mod
index b7b84bf2..e8f157c5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/wader/fq
 
-go 1.21
+go 1.22
 
 // fork of github.com/itchyny/gojq, see github.com/wader/gojq fq branch
 require github.com/wader/gojq v0.12.1-0.20240822064856-a7688e3344e7
diff --git a/pkg/bitio/readwrite64_test.go b/pkg/bitio/readwrite64_test.go
index 8f960e88..3f7e07ef 100644
--- a/pkg/bitio/readwrite64_test.go
+++ b/pkg/bitio/readwrite64_test.go
@@ -136,7 +136,6 @@ func TestWrite64(t *testing.T) {
 		{0b1, 1, []byte{0b0000_0000}, 7, []byte{0b0000_0001}},
 	}
 	for _, tC := range testCases {
-		tC := tC
 		t.Run(fmt.Sprintf("%d %d %s", tC.v, tC.nBits, hex.EncodeToString(tC.buf)), func(t *testing.T) {
 			bitio.Write64(tC.v, tC.nBits, tC.buf, tC.firstBit)
 			if !bytes.Equal(tC.expectedBuf, tC.buf) {