fix: resolve golangci-lint v2.10.1 issues

Fix gci import ordering (4 files) and staticcheck violations (3 files)
surfaced after upgrading golangci-lint from v1.64.8 to v2.10.1.

Signed-off-by: Mark Tsai <111229657+shuan1026@users.noreply.github.com>

Author: shuan1026

cmd/bbolt/main.go

@@ -1768,11 +1768,11 @@ Additional options include:
 
 type cmdKvStringer struct{}
 
-func (_ cmdKvStringer) KeyToString(key []byte) string {
+func (cmdKvStringer) KeyToString(key []byte) string {
 	return bytesToAsciiOrHex(key)
 }
 
-func (_ cmdKvStringer) ValueToString(value []byte) string {
+func (cmdKvStringer) ValueToString(value []byte) string {
 	return bytesToAsciiOrHex(value)
 }
 
@@ -1781,7 +1781,7 @@ func CmdKvStringer() bolt.KVStringer {
 }
 
 func findLastBucket(tx *bolt.Tx, bucketNames []string) (*bolt.Bucket, error) {
-	var lastbucket *bolt.Bucket = tx.Bucket([]byte(bucketNames[0]))
+	lastbucket := tx.Bucket([]byte(bucketNames[0]))
 	if lastbucket == nil {
 		return nil, berrors.ErrBucketNotFound
 	}

cmd/bbolt/main_test.go

@@ -14,14 +14,13 @@ import (
 	"sync"
 	"testing"
 
-	"go.etcd.io/bbolt/internal/btesting"
-	"go.etcd.io/bbolt/internal/guts_cli"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	bolt "go.etcd.io/bbolt"
 	main "go.etcd.io/bbolt/cmd/bbolt"
+	"go.etcd.io/bbolt/internal/btesting"
+	"go.etcd.io/bbolt/internal/guts_cli"
 )
 
 // Ensure the "info" command can print information about a database.

internal/common/page.go

@@ -334,17 +334,17 @@ func (s Pgids) Len() int           { return len(s) }
 func (s Pgids) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 func (s Pgids) Less(i, j int) bool { return s[i] < s[j] }
 
-// Merge returns the sorted union of a and b.
-func (a Pgids) Merge(b Pgids) Pgids {
+// Merge returns the sorted union of s and b.
+func (s Pgids) Merge(b Pgids) Pgids {
 	// Return the opposite slice if one is nil.
-	if len(a) == 0 {
+	if len(s) == 0 {
 		return b
 	}
 	if len(b) == 0 {
-		return a
+		return s
 	}
-	merged := make(Pgids, len(a)+len(b))
-	Mergepgids(merged, a, b)
+	merged := make(Pgids, len(s)+len(b))
+	Mergepgids(merged, s, b)
 	return merged
 }
 

movebucket_test.go

@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"go.etcd.io/bbolt"
 	"go.etcd.io/bbolt/errors"
 	"go.etcd.io/bbolt/internal/btesting"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestTx_MoveBucket(t *testing.T) {

tests/dmflakey/dmflakey_test.go

@@ -12,11 +12,11 @@ import (
 	"testing"
 	"time"
 
-	testutils "go.etcd.io/bbolt/tests/utils"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
+
+	testutils "go.etcd.io/bbolt/tests/utils"
 )
 
 func TestMain(m *testing.M) {

tests/robustness/powerfailure_test.go

@@ -19,11 +19,11 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/bbolt/tests/dmflakey"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/tests/dmflakey"
 )
 
 var panicFailpoints = []string{
@@ -140,7 +140,7 @@ func TestRestartFromPowerFailureXFS(t *testing.T) {
 }
 
 func doPowerFailure(t *testing.T, du time.Duration, fsType dmflakey.FSType, mkfsOpt string, fsMountOpt string, useFailpoint bool) {
-	flakey := initFlakeyDevice(t, strings.Replace(t.Name(), "/", "_", -1), fsType, mkfsOpt, fsMountOpt)
+	flakey := initFlakeyDevice(t, strings.ReplaceAll(t.Name(), "/", "_"), fsType, mkfsOpt, fsMountOpt)
 	root := flakey.RootFS()
 
 	dbPath := filepath.Join(root, "boltdb")

tx_check.go

@@ -281,10 +281,10 @@ func HexKVStringer() KVStringer {
 
 type hexKvStringer struct{}
 
-func (_ hexKvStringer) KeyToString(key []byte) string {
+func (hexKvStringer) KeyToString(key []byte) string {
 	return hex.EncodeToString(key)
 }
 
-func (_ hexKvStringer) ValueToString(value []byte) string {
+func (hexKvStringer) ValueToString(value []byte) string {
 	return hex.EncodeToString(value)
 }