Merge pull request #203 from alexandear-org/chore/enable-modernize-linter

ReneWerner87 · web-flow · commit ea2559f5db37 · 2026-05-25T20:55:48.000+02:00
♻️ refactor: remove redundant modernize workflow
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -28,8 +28,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
         with:
-          # NOTE: Keep this in sync with the version from go.mod
-          go-version: "1.25.x"
+          go-version-file: go.mod
 
       - name: Run Benchmark
         run: set -o pipefail; go test ./... -benchmem -run=^$ -bench . | tee output.txt
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,3 +22,5 @@ permissions:
 jobs:
   lint:
     uses: gofiber/.github/.github/workflows/go-lint-single.yml@main
+    with:
+      golangci-lint-version: v2.12.2
diff --git a/.github/workflows/modernize.yml b/.github/workflows/modernize.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
   Build:
     strategy:
       matrix:
-        go-version: [1.24.x, 1.25.x]
+        go-version: [1.25.x, 1.26.x]
         platform: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -44,7 +44,7 @@ jobs:
         run: gotestsum -f testname -- ./... -race -count=1 -coverprofile=coverage.txt -covermode=atomic -shuffle=on
 
       - name: Upload coverage reports to Codecov
-        if: ${{ matrix.platform == 'ubuntu-latest' && matrix.go-version == '1.25.x' }}
+        if: ${{ matrix.platform == 'ubuntu-latest' && matrix.go-version == '1.26.x' }}
         uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.golangci.yml b/.golangci.yml
@@ -194,6 +194,8 @@ linters:
           disabled: true # TODO: Do not disable
         - name: package-comments
           disabled: true
+        - name: package-naming
+          disabled: true
         - name: optimize-operands-order
           disabled: true
         - name: unchecked-type-assertion
@@ -320,6 +322,7 @@ linters:
     # - maligned
     - mirror
     - misspell
+    - modernize
     - musttag
     - nakedret
     # - nestif
diff --git a/byteseq_test.go b/byteseq_test.go
@@ -351,7 +351,6 @@ func Test_TrimSpace(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			// Test string variant - must match strings.TrimSpace
@@ -370,7 +369,6 @@ func Test_TrimSpace(t *testing.T) {
 
 func Benchmark_TrimSpace(b *testing.B) {
 	for _, tc := range trimSpaceBenchmarkCases {
-		tc := tc // capture range variable
 		b.Run("fiber/"+tc.name, func(b *testing.B) {
 			b.ReportAllocs()
 			b.SetBytes(int64(len(tc.input)))
@@ -396,7 +394,6 @@ func Benchmark_TrimSpace(b *testing.B) {
 
 func Benchmark_TrimSpaceBytes(b *testing.B) {
 	for _, tc := range trimSpaceBenchmarkCases {
-		tc := tc // capture range variable
 		input := []byte(tc.input)
 		b.Run("fiber/"+tc.name, func(b *testing.B) {
 			b.ReportAllocs()
diff --git a/common.go b/common.go
@@ -118,7 +118,7 @@ func GetArgument(arg string) bool {
 
 // IncrementIPRange Find available next IP address
 func IncrementIPRange(ip net.IP) {
-	for j := len(ip) - 1; j >= 0; j-- {
+	for j := len(ip) - 1; j >= 0; j-- { //nolint:modernize // slicesbackward: false positive
 		ip[j]++
 		if ip[j] > 0 {
 			break
diff --git a/common_test.go b/common_test.go
@@ -60,12 +60,12 @@ func Test_UUIDv4_Concurrency(t *testing.T) {
 	var res string
 	ch := make(chan string, iterations)
 	results := make(map[string]string)
-	for i := 0; i < iterations; i++ {
+	for range iterations {
 		go func() {
 			ch <- UUIDv4()
 		}()
 	}
-	for i := 0; i < iterations; i++ {
+	for range iterations {
 		res = <-ch
 		results[res] = res
 	}
@@ -103,12 +103,12 @@ func Test_GenerateSecureToken_Concurrency(t *testing.T) {
 	iterations := 1000
 	ch := make(chan string, iterations)
 	results := make(map[string]string)
-	for i := 0; i < iterations; i++ {
+	for range iterations {
 		go func() {
 			ch <- GenerateSecureToken(32)
 		}()
 	}
-	for i := 0; i < iterations; i++ {
+	for range iterations {
 		res := <-ch
 		results[res] = res
 	}
@@ -260,7 +260,6 @@ func Test_IncrementIPRange(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		c := c
 		t.Run(c.input.String(), func(t *testing.T) {
 			t.Parallel()
 			IncrementIPRange(c.input)
@@ -282,7 +281,6 @@ func Test_IncrementIPRange_IPv6(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		c := c
 		t.Run(c.input.String(), func(t *testing.T) {
 			t.Parallel()
 			IncrementIPRange(c.input)
diff --git a/convert.go b/convert.go
@@ -221,7 +221,7 @@ func ToString(arg any, timeFormat ...string) string {
 			return ""
 		}
 		kind := rv.Kind()
-		if kind == reflect.Ptr && !rv.IsNil() {
+		if kind == reflect.Pointer && !rv.IsNil() {
 			// Dereference the pointer and recursively call ToString
 			return ToString(rv.Elem().Interface(), timeFormat...)
 		} else if kind == reflect.Slice || kind == reflect.Array {
diff --git a/convert_test.go b/convert_test.go
@@ -130,7 +130,6 @@ func Test_ToString(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc // capture range variable
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 			var res string
@@ -152,7 +151,6 @@ func Test_ToString(t *testing.T) {
 		{&intPtr, "42"},
 	}
 	for _, tc := range testsPtr {
-		tc := tc
 		t.Run("pointer to "+reflect.TypeOf(tc.input).Elem().String(), func(t *testing.T) {
 			t.Parallel()
 			res := ToString(tc.input)
diff --git a/file.go b/file.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	pathpkg "path"
 	"path/filepath"
-	"sort"
+	"slices"
 )
 
 // Walk walks the filesystem rooted at root, calling walkFn for each file or
@@ -46,7 +46,7 @@ func readDirNames(fs http.FileSystem, dirname string) ([]string, error) {
 	for i := range fis {
 		names[i] = fis[i].Name()
 	}
-	sort.Strings(names)
+	slices.Sort(names)
 	return names, nil
 }
 
diff --git a/format.go b/format.go
@@ -102,11 +102,11 @@ func FormatUint32(n uint32) string {
 	i := 10
 	for n >= 10 {
 		i--
-		buf[i] = byte(n%10) + '0' //nolint:gosec // i is always in bounds: starts at 10, decrements max 10 times for uint32
+		buf[i] = byte(n%10) + '0'
 		n /= 10
 	}
 	i--
-	buf[i] = byte(n) + '0' //nolint:gosec // i is always >= 0 after loop
+	buf[i] = byte(n) + '0'
 	return string(buf[i:])
 }
 
@@ -145,11 +145,11 @@ func FormatUint16(n uint16) string {
 	i := 5
 	for n >= 10 {
 		i--
-		buf[i] = byte(n%10) + '0' //nolint:gosec // i is always in bounds: starts at 5, decrements max 5 times for uint16
+		buf[i] = byte(n%10) + '0'
 		n /= 10
 	}
 	i--
-	buf[i] = byte(n) + '0' //nolint:gosec // i is always >= 0 after loop
+	buf[i] = byte(n) + '0'
 	return string(buf[i:])
 }
 
@@ -169,13 +169,13 @@ func FormatInt16(n int16) string {
 	i := 6
 	for un >= 10 {
 		i--
-		buf[i] = byte(un%10) + '0' //nolint:gosec // i is always in bounds
+		buf[i] = byte(un%10) + '0'
 		un /= 10
 	}
 	i--
-	buf[i] = byte(un) + '0' //nolint:gosec // i is always >= 1 after loop
+	buf[i] = byte(un) + '0'
 	i--
-	buf[i] = '-' //nolint:gosec // i is always >= 0 after decrement
+	buf[i] = '-'
 	return string(buf[i:])
 }
 
@@ -210,6 +210,6 @@ func AppendInt(dst []byte, n int64) []byte {
 	var buf [20]byte
 	i := formatUintBuf(&buf, uint64(-n))
 	i--
-	buf[i] = '-' //nolint:gosec // i is always >= 0: formatUintBuf returns at least 1 for any input, so i >= 0 after decrement
+	buf[i] = '-'
 	return append(dst, buf[i:]...)
 }
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gofiber/utils/v2
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/fxamacker/cbor/v2 v2.9.2
diff --git a/strings/case_test.go b/strings/case_test.go
@@ -62,8 +62,7 @@ func Test_ToLower(t *testing.T) {
 
 func Test_ASCII_EdgeCases(t *testing.T) {
 	t.Parallel()
-	for i := 0; i < 128; i++ {
-		idx := i
+	for idx := range 128 {
 		c := byte(idx)
 		t.Run(fmt.Sprintf("ASCII-char-%03d", idx), func(t *testing.T) {
 			t.Parallel()
diff --git a/time.go b/time.go
@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	timestamp   uint32
+	timestamp   atomic.Uint32
 	updaterOnce sync.Once
 	stopUpdater chan struct{}
 	updaterDone chan struct{}
@@ -16,14 +16,14 @@ var (
 // Timestamp returns the current cached Unix timestamp (seconds).
 // Call StartTimeStampUpdater() once at app startup for best performance.
 func Timestamp() uint32 {
-	return atomic.LoadUint32(&timestamp)
+	return timestamp.Load()
 }
 
 // StartTimeStampUpdater launches a background goroutine that updates the cached timestamp every second.
 // It is safe to call multiple times; only the first call will start the updater.
 func StartTimeStampUpdater() {
 	updaterOnce.Do(func() {
-		atomic.StoreUint32(&timestamp, uint32(time.Now().Unix()))
+		timestamp.Store(uint32(time.Now().Unix()))
 		stopUpdater = make(chan struct{})
 		updaterDone = make(chan struct{})
 
@@ -35,7 +35,7 @@ func StartTimeStampUpdater() {
 			for {
 				select {
 				case <-ticker.C:
-					atomic.StoreUint32(&timestamp, uint32(time.Now().Unix()))
+					timestamp.Store(uint32(time.Now().Unix()))
 				case <-stopUpdater:
 					return
 				}

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func ToString(arg any, timeFormat ...string) string {`
`221`	`221`	`return ""`
`222`	`222`	`}`
`223`	`223`	`kind := rv.Kind()`
`224`		`- if kind == reflect.Ptr && !rv.IsNil() {`
	`224`	`+ if kind == reflect.Pointer && !rv.IsNil() {`
`225`	`225`	`// Dereference the pointer and recursively call ToString`
`226`	`226`	`return ToString(rv.Elem().Interface(), timeFormat...)`
`227`	`227`	`} else if kind == reflect.Slice \|\| kind == reflect.Array {`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ func Test_ToString(t *testing.T) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`for _, tc := range tests {`
`133`		`- tc := tc // capture range variable`
`134`	`133`	`t.Run(tc.name, func(t *testing.T) {`
`135`	`134`	`t.Parallel()`
`136`	`135`	`var res string`
`@@ -152,7 +151,6 @@ func Test_ToString(t *testing.T) {`
`152`	`151`	`{&intPtr, "42"},`
`153`	`152`	`}`
`154`	`153`	`for _, tc := range testsPtr {`
`155`		`- tc := tc`
`156`	`154`	`t.Run("pointer to "+reflect.TypeOf(tc.input).Elem().String(), func(t *testing.T) {`
`157`	`155`	`t.Parallel()`
`158`	`156`	`res := ToString(tc.input)`