upgrade linter and fix linter issues

Author: cornelk

.golangci.yml

@@ -1,5 +1,6 @@
+version: "2"
 run:
-  timeout: 5m
+  modules-download-mode: readonly
 
 linters:
   enable:
@@ -8,6 +9,7 @@ linters:
     - bidichk # Checks for dangerous unicode character sequences
     - containedctx # detects struct contained context.Context field
     - contextcheck # check the function whether use a non-inherited context
+    - copyloopvar # detects places where loop variables are copied
     - cyclop # checks function and package cyclomatic complexity
     - decorder # check declaration order and count of types, constants, variables and functions
     - dogsled # Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f())
@@ -17,18 +19,15 @@ linters:
     - errname # Checks that errors are prefixed with the `Err` and error types are suffixed with the `Error`
     - errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
     - funlen # Tool for detection of long functions
-    - gci # controls golang package import order and makes it always deterministic
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid
     - gocognit # Computes and checks the cognitive complexity of functions
     - gocritic # Provides diagnostics that check for bugs, performance and style issues
     - gocyclo # Computes and checks the cyclomatic complexity of functions
     - godot # Check if comments end in a period
-    - gofmt # checks whether code was gofmt-ed
-    - goimports # Check import statements are formatted according to the 'goimport' command
-    - gosimple # Linter for Go source code that specializes in simplifying a code
     - govet # reports suspicious constructs, such as Printf calls with wrong arguments
     - grouper # An analyzer to analyze expression groups
     - ineffassign # Detects when assignments to existing variables are not used
+    - intrange # finds places where for loops could make use of an integer range.
     - maintidx # measures the maintainability index of each function
     - makezero # Finds slice declarations with non-zero initial length
     - mirror # reports wrong mirror patterns of bytes/strings usage
@@ -43,35 +42,38 @@ linters:
     - reassign # Checks that package variables are not reassigned
     - revive # drop-in replacement of golint
     - staticcheck # drop-in replacement of go vet
-    - stylecheck # Stylecheck is a replacement for golint
     - testifylint # Checks usage of github.com/stretchr/testify
     - thelper # checks the consistency of test helpers
     - tparallel # detects inappropriate usage of t.Parallel()
-    - typecheck # parses and type-checks Go code
     - unconvert # Remove unnecessary type conversions
     - unparam # Reports unused function parameters
     - unused # Checks Go code for unused constants, variables, functions and types
     - usestdlibvars # detect the possibility to use variables/constants from the Go standard library
-    - usetesting # Reports uses of functions with replacement inside the testing package
     - wastedassign # finds wasted assignment statements
     - whitespace # detects leading and trailing whitespace
     - wrapcheck # Checks that errors returned from external packages are wrapped
 
-linters-settings:
-  cyclop:
-    max-complexity: 15
-  gocritic:
-    disabled-checks:
-      - newDeref
-  govet:
-    disable:
-      - unsafeptr
-  staticcheck:
-    # TODO SA1019 deprecated usage
-    checks: [ "all", "-SA1019" ]
+  settings:
+    cyclop:
+      max-complexity: 15
+    govet:
+      disable:
+        - unsafeptr
+    staticcheck:
+      checks:
+        - all
+        - '-SA1019' # should not use deprecated functions
+    whitespace:
+      multi-if: true # Enforces newlines (or comments) after every multi-line if statement
+      multi-func: true # Enforces newlines (or comments) after every multi-line function signature
+  exclusions:
+    rules:
+      - linters:
+          - err113
+        text: do not define dynamic errors
 
-issues:
-  exclude-rules:
-    - linters:
-        - err113
-      text: "do not define dynamic errors"
+formatters:
+  enable:
+    - gci # controls golang package import order and makes it always deterministic
+    - gofmt # checks whether code was gofmt-ed
+    - goimports # Check import statements are formatted according to the 'goimport' command

Makefile

@@ -1,4 +1,4 @@
-GOLANGCI_VERSION = v1.64.6
+GOLANGCI_VERSION = v2.3.0
 
 help: ## show help, shown by default if no target is specified
 	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -26,4 +26,4 @@ test-coverage-web: test-coverage ## run unit tests and show test coverage in bro
 	go tool cover -html=.testCoverage
 
 install-linters: ## install all used linters
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_VERSION}
+	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_VERSION}

example_test.go

@@ -13,7 +13,7 @@ func TestAPICounter(t *testing.T) {
 	t.Parallel()
 	m := New[string, *int64]()
 
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		s := fmt.Sprintf("/api%d/", i%4)
 
 		counter := int64(0)

hashmap_test.go

@@ -166,10 +166,7 @@ func TestGrow(t *testing.T) {
 	m := New[int, string]()
 	m.Grow(uintptr(63))
 
-	for { // make sure to wait for resize operation to finish
-		if m.resizing.Load() == 0 {
-			break
-		}
+	for m.resizing.Load() != 0 { // make sure to wait for resize operation to finish
 		time.Sleep(time.Microsecond * 50)
 	}
 
@@ -190,10 +187,7 @@ func TestResize(t *testing.T) {
 
 	assert.Equal(t, itemCount, m.Len())
 
-	for { // make sure to wait for resize operation to finish
-		if m.resizing.Load() == 0 {
-			break
-		}
+	for m.resizing.Load() != 0 { // make sure to wait for resize operation to finish
 		time.Sleep(time.Microsecond * 50)
 	}
 
@@ -324,7 +318,7 @@ func TestHashMap_parallel(t *testing.T) {
 			defer timer.Stop()
 		InfLoop:
 			for {
-				for i := 0; i < maxVal; i++ {
+				for i := range maxVal {
 					select {
 					case <-timer.C:
 						break InfLoop
@@ -347,7 +341,7 @@ func TestHashMap_parallel(t *testing.T) {
 	}
 
 	// Initial fill.
-	for i := 0; i < maxVal; i++ {
+	for i := range maxVal {
 		m.Set(i, i)
 	}
 	t.Run("set_get", func(t *testing.T) {
@@ -383,7 +377,7 @@ func TestHashMap_SetConcurrent(t *testing.T) {
 	m := New[string, int]()
 
 	var wg sync.WaitGroup
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		wg.Add(1)
 
 		go func(i int) {
@@ -406,7 +400,7 @@ func TestHashMap_SetConcurrent(t *testing.T) {
 func TestConcurrentInsertDelete(t *testing.T) {
 	t.Parallel()
 
-	for i := 0; i < 200; i++ {
+	for range 200 {
 		el1 := &ListElement[int, int]{
 			key:     111,
 			keyHash: 111,