Upgraded go min version to 1.23, linter, workflow last 2 go versions

Author: bogcon

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.23.x, 1.24.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -50,4 +50,3 @@ jobs:
         file: cover.out
         flag-name: ${{ runner.os }}-go-${{ matrix.go-version }}
         fail-on-error: false
-

.golangci-lint.yml

@@ -0,0 +1,34 @@
+version: "2"
+
+run:
+  tests: true
+
+linters:
+  default: none
+  enable:
+    - goconst
+    - gocritic
+    - godot
+    - govet
+    - ineffassign
+    - intrange
+    - misspell
+    - nlreturn
+    - noctx
+    - revive
+    - staticcheck
+    - unused
+    - whitespace
+
+formatters:
+  enable:
+    - gofmt
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+        - pattern: 'a[b:len(a)]'
+          replacement: 'a[b:]'
+        - pattern: 'a[0:b]'
+          replacement: 'a[:b]'

.golangci.yml

@@ -1,4 +1,4 @@
-LINTER_VERSION=v1.57.1
+LINTER_VERSION=v2.1.6
 LINTER=./bin/golangci-lint
 ifeq ($(OS),Windows_NT)
 	LINTER=./bin/golangci-lint.exe
@@ -10,7 +10,7 @@ all: clean setup lint test ## Run sequentially clean, setup, lint and test.
 
 .PHONY: lint
 lint: ## Run linter and detect go mod tidy changes.
-	$(LINTER) run -c ./.golangci-lint.yml --fix
+	$(LINTER) run -c ./.golangci.yml --fix
 	@make tidy
 	@if ! git diff --quiet; then \
 		echo "'go mod tidy' resulted in changes or working tree is dirty:"; \

Makefile

@@ -14,7 +14,7 @@ import (
 
 // assertEqual checks if 2 values are equal.
 // Returns successful assertion status.
-func assertEqual(t *testing.T, expected interface{}, actual interface{}) bool {
+func assertEqual(t *testing.T, expected, actual any) bool {
 	t.Helper()
 	if !reflect.DeepEqual(expected, actual) {
 		t.Errorf(
@@ -32,7 +32,7 @@ func assertEqual(t *testing.T, expected interface{}, actual interface{}) bool {
 
 // assertNotNil checks if value passed is not nil.
 // Returns successful assertion status.
-func assertNotNil(t *testing.T, actual interface{}) bool {
+func assertNotNil(t *testing.T, actual any) bool {
 	t.Helper()
 	if isNil(actual) {
 		t.Error("should not be nil")
@@ -45,7 +45,7 @@ func assertNotNil(t *testing.T, actual interface{}) bool {
 
 // assertNil checks if value passed is nil.
 // Returns successful assertion status.
-func assertNil(t *testing.T, actual interface{}) bool {
+func assertNil(t *testing.T, actual any) bool {
 	t.Helper()
 	if !isNil(actual) {
 		t.Errorf("expected nil, but got %+v", actual)
@@ -70,7 +70,7 @@ func assertTrue(t *testing.T, actual bool) bool {
 }
 
 // isNil checks an interface if it is nil.
-func isNil(object interface{}) bool {
+func isNil(object any) bool {
 	if object == nil {
 		return true
 	}

assert_test.go

@@ -93,7 +93,7 @@ func setUpTmpCsvFile(rowsCount int64) (string, error) {
 	fName := f.Name()
 
 	var id int64
-	var buf = make([]byte, 0, 1280)
+	buf := make([]byte, 0, 1280)
 	bufLenConst := 4 + 2 + 1 + len(colValueNamePrefix) + len(colValueDescription) + len(colValuePrice) + len(colValueStock) // 4 x comma, 2 x quote, 1 x \n,
 	for id = 1; id <= rowsCount; id++ {
 		buf = buf[0:0:1280]
@@ -110,7 +110,7 @@ func setUpTmpCsvFile(rowsCount int64) (string, error) {
 		buf = append(buf, colValueStock...)
 		buf = append(buf, "\n"...)
 		bufLen := bufLenConst + 2*len(idStr)
-		_, err := f.Write(buf[0:bufLen])
+		_, err := f.Write(buf[:bufLen])
 		if err != nil {
 			_ = f.Close()
 			tearDownTmpCsvFile(fName)
@@ -205,7 +205,7 @@ func consumeBigCsvReaderResults(rowsChans []bigcsvreader.RowsChan, errsChan bigc
 		wg    sync.WaitGroup
 	)
 
-	for i := 0; i < len(rowsChans); i++ {
+	for i := range rowsChans {
 		wg.Add(1)
 		go func(rowsChan bigcsvreader.RowsChan, waitGr *sync.WaitGroup) {
 			var localCount int64

cmd/pprof/main.go

@@ -48,7 +48,7 @@ func ExampleCsvReader() {
 
 	// process rows and errors:
 
-	for i := 0; i < len(rowsChans); i++ {
+	for i := range rowsChans {
 		wg.Add(1)
 		go rowWorker(rowsChans[i], &wg)
 	}

example_test.go

@@ -1,3 +1,3 @@
 module github.com/actforgood/bigcsvreader
 
-go 1.16
+go 1.23

go.mod

@@ -38,7 +38,7 @@ func ComputeGoroutineOffsets(totalBytes, maxGoroutines, minBytesReadByAGoroutine
 	bytesPerGoroutine := totalBytes / totalGoroutines
 	distribution := make([][2]int, totalGoroutines)
 	start, end := 0, bytesPerGoroutine-1
-	for goroutineNo := 0; goroutineNo < totalGoroutines-1; goroutineNo++ {
+	for goroutineNo := range totalGoroutines - 1 {
 		distribution[goroutineNo] = [2]int{start, end}
 		start = end + 1
 		end += bytesPerGoroutine

internal/helper.go

@@ -117,40 +117,39 @@ func TestComputeGoroutineOffsets(t *testing.T) {
 	}
 
 	for _, testData := range tests {
-		test := testData // capture range variable
-		t.Run(test.name, func(t *testing.T) {
+		t.Run(testData.name, func(t *testing.T) {
 			// act
 			result := internal.ComputeGoroutineOffsets(
-				test.inputTotalBytes,
-				test.inputMaxGoroutines,
-				test.inputMinBytesReadByAGoroutine,
+				testData.inputTotalBytes,
+				testData.inputMaxGoroutines,
+				testData.inputMinBytesReadByAGoroutine,
 			)
 
 			// assert
-			if !reflect.DeepEqual(result, test.expectedResult) {
-				t.Errorf("expected %v, but got %v | %s", test.expectedResult, result, test.name)
+			if !reflect.DeepEqual(result, testData.expectedResult) {
+				t.Errorf("expected %v, but got %v | %s", testData.expectedResult, result, testData.name)
 			}
 		})
 	}
 }
 
 func BenchmarkComputeGoroutineOffsets_1(b *testing.B) {
 	b.ReportAllocs()
-	for n := 0; n < b.N; n++ {
+	for range b.N {
 		_ = internal.ComputeGoroutineOffsets(1024, 32, 1)
 	}
 }
 
 func BenchmarkComputeGoroutineOffsets_2(b *testing.B) {
 	b.ReportAllocs()
-	for n := 0; n < b.N; n++ {
+	for range b.N {
 		_ = internal.ComputeGoroutineOffsets(1024, 32, 1025)
 	}
 }
 
 func BenchmarkComputeGoroutineOffsets_3(b *testing.B) {
 	b.ReportAllocs()
-	for n := 0; n < b.N; n++ {
+	for range b.N {
 		_ = internal.ComputeGoroutineOffsets(1024, 32, 1023)
 	}
 }