refactor: run go fix ./...

Adphi · Adphi · commit daaf66ff5aba · 2026-02-26T19:04:26.000+01:00
Signed-off-by: Adphi &lt;philippe.adrien.nousse@gmail.com&gt;
diff --git a/cmd/protoc-gen-protodb/main.go b/cmd/protoc-gen-protodb/main.go
@@ -50,7 +50,7 @@ func (p *mod) InitContext(c pgs.BuildContext) {
 	p.ModuleBase.InitContext(c)
 	p.ctx = pgsgo.InitContext(c.Parameters())
 
-	tpl := template.New("protodb").Funcs(map[string]interface{}{
+	tpl := template.New("protodb").Funcs(map[string]any{
 		"package": p.ctx.PackageName,
 		"name":    p.ctx.Name,
 		"enabled": func(m pgs.Message) bool {
diff --git a/cmp.go b/cmp.go
@@ -17,6 +17,7 @@ package protodb
 import (
 	"bytes"
 	"fmt"
+	"maps"
 
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -125,9 +126,7 @@ func cmpField(f protoreflect.FieldDescriptor, v1, v2 protoreflect.Value, prefix
 		if len(mdiff) == 0 {
 			return
 		}
-		for k, v := range mdiff {
-			diffs[k] = v
-		}
+		maps.Copy(diffs, mdiff)
 		return
 	}
 	if !equals {
@@ -179,10 +178,7 @@ func cmp(m1, m2 proto.Message, prefix string) map[string]*pb.FieldDiff {
 				}
 			}
 			if l2Length > l1Length {
-				start := l1Length - 1
-				if start < 0 {
-					start = 0
-				}
+				start := max(l1Length-1, 0)
 				for i := start; i < l2Length; i++ {
 					p := fmt.Sprintf("%s%s[%d]", prefix, f.Name(), i)
 					cmpField(f, protoreflect.Value{}, l2.Get(i), p, diffs)
diff --git a/internal/badgerd/logger.go b/internal/badgerd/logger.go
@@ -27,25 +27,25 @@ type logWrapper struct {
 	badger.Logger
 }
 
-func (l *logWrapper) Errorf(s string, i ...interface{}) {
+func (l *logWrapper) Errorf(s string, i ...any) {
 	l.log(l.Logger.Errorf, s, i...)
 }
 
-func (l *logWrapper) Warningf(s string, i ...interface{}) {
+func (l *logWrapper) Warningf(s string, i ...any) {
 	l.log(l.Logger.Warningf, s, i...)
 }
 
-func (l *logWrapper) Infof(s string, i ...interface{}) {
+func (l *logWrapper) Infof(s string, i ...any) {
 	l.log(l.Logger.Infof, s, i...)
 }
 
-func (l *logWrapper) Debugf(s string, i ...interface{}) {
+func (l *logWrapper) Debugf(s string, i ...any) {
 	l.log(l.Logger.Debugf, s, i...)
 }
 
-func (l *logWrapper) log(fn func(string, ...interface{}), s string, i ...interface{}) {
+func (l *logWrapper) log(fn func(string, ...any), s string, i ...any) {
 	msg := fmt.Sprintf(s, i...)
-	for _, v := range strings.Split(msg, "\n") {
+	for v := range strings.SplitSeq(msg, "\n") {
 		if v == "" {
 			continue
 		}
diff --git a/internal/badgerd/options.go b/internal/badgerd/options.go
@@ -27,11 +27,11 @@ var (
 )
 
 type Logger interface {
-	Errorf(string, ...interface{})
-	Warningf(string, ...interface{})
-	Infof(string, ...interface{})
-	Debugf(string, ...interface{})
-	Tracef(string, ...interface{})
+	Errorf(string, ...any)
+	Warningf(string, ...any)
+	Infof(string, ...any)
+	Debugf(string, ...any)
+	Tracef(string, ...any)
 }
 
 type Option func(o *options)
diff --git a/internal/badgerd/pending/iterator_test.go b/internal/badgerd/pending/iterator_test.go
@@ -165,7 +165,7 @@ func TestIterator(t *testing.T) {
 		assert.Equal(t, -1, i)
 	})
 
-	for i := 0; i < count; i++ {
+	for i := range count {
 		w.Delete(initial[i].Key)
 	}
 
diff --git a/internal/badgerd/pending/wal_test.go b/internal/badgerd/pending/wal_test.go
@@ -44,7 +44,7 @@ func newEntry(i int, size int64) *badger.Entry {
 
 func genEntries(count int, size int64) []*badger.Entry {
 	var entries []*badger.Entry
-	for i := 0; i < count; i++ {
+	for i := range count {
 		entries = append(entries, newEntry(i, size))
 	}
 	return entries
diff --git a/internal/badgerd/replication/gossip/nodes.go b/internal/badgerd/replication/gossip/nodes.go
@@ -295,7 +295,7 @@ func (r *Gossip) loadNodes() ([]string, error) {
 		return nil, err
 	}
 	var nodes []string
-	for _, v := range strings.Split(string(b), "\n") {
+	for v := range strings.SplitSeq(string(b), "\n") {
 		if v != "" && v != r.name {
 			nodes = append(nodes, v)
 		}
diff --git a/internal/badgerd/replication/gossip/service.go b/internal/badgerd/replication/gossip/service.go
@@ -46,7 +46,7 @@ func (r *Gossip) Init(req *pb2.InitRequest, ss pb2.ReplicationService_InitServer
 		return gerrs.Internalf("failed to split host port: %v", err)
 	}
 	var found bool
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		for _, v := range r.clients() {
 			if found = addr == v.addr.String(); found {
 				break
diff --git a/internal/badgerd/replication/gossip/sync.go b/internal/badgerd/replication/gossip/sync.go
@@ -67,30 +67,30 @@ func (m *Map[T]) Delete(key string) {
 }
 
 func (m *Map[T]) Range(f func(key string, value T) bool) {
-	m.m.Range(func(key, value interface{}) bool {
+	m.m.Range(func(key, value any) bool {
 		return f(key.(string), value.(T))
 	})
 }
 
 func (m *Map[T]) Len() int {
 	var l int
-	m.m.Range(func(key, value interface{}) bool {
+	m.m.Range(func(key, value any) bool {
 		l++
 		return true
 	})
 	return l
 }
 
 func (m *Map[T]) Clear() {
-	m.m.Range(func(key, value interface{}) bool {
+	m.m.Range(func(key, value any) bool {
 		m.m.Delete(key)
 		return true
 	})
 }
 
 func (m *Map[T]) Values() []T {
 	var values []T
-	m.m.Range(func(key, value interface{}) bool {
+	m.m.Range(func(key, value any) bool {
 		values = append(values, value.(T))
 		return true
 	})
@@ -99,7 +99,7 @@ func (m *Map[T]) Values() []T {
 
 func (m *Map[T]) Keys() []string {
 	var keys []string
-	m.m.Range(func(key, value interface{}) bool {
+	m.m.Range(func(key, value any) bool {
 		keys = append(keys, key.(string))
 		return true
 	})
diff --git a/internal/badgerd/replication/gossip/tx.go b/internal/badgerd/replication/gossip/tx.go
@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 	"sync"
 	"sync/atomic"
 
@@ -87,12 +88,7 @@ func (r *tx) removeSteam(s *stream) {
 func (r *tx) hasStreams(s *stream) bool {
 	r.cmu.RLock()
 	defer r.cmu.RUnlock()
-	for _, v := range r.cs {
-		if v == s {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(r.cs, s)
 }
 
 func (r *tx) New(ctx context.Context, tx *badger.Txn) error {
diff --git a/internal/breaking/wire.go b/internal/breaking/wire.go
@@ -17,6 +17,7 @@ package breaking
 import (
 	"fmt"
 	"reflect"
+	"slices"
 	"sort"
 
 	"google.golang.org/protobuf/proto"
@@ -634,12 +635,7 @@ func isFixed64Swap(a, b protoreflect.Kind) bool {
 }
 
 func isKindInSet(kind protoreflect.Kind, set []protoreflect.Kind) bool {
-	for _, candidate := range set {
-		if kind == candidate {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(set, kind)
 }
 
 func fieldTypeLabel(fd protoreflect.FieldDescriptor) string {
diff --git a/internal/db/db.go b/internal/db/db.go
@@ -524,7 +524,7 @@ func (db *db) closed() bool {
 }
 
 func (db *db) unmarshal(b []byte, m proto.Message) error {
-	switch v := interface{}(m).(type) {
+	switch v := any(m).(type) {
 	case interface{ UnmarshalVT(b []byte) error }:
 		return v.UnmarshalVT(b)
 	case interface{ Unmarshal(b []byte) error }:
@@ -535,7 +535,7 @@ func (db *db) unmarshal(b []byte, m proto.Message) error {
 }
 
 func (db *db) marshal(m proto.Message) ([]byte, error) {
-	switch v := interface{}(m).(type) {
+	switch v := any(m).(type) {
 	case interface{ MarshalVT() ([]byte, error) }:
 		return v.MarshalVT()
 	case interface{ Marshal() ([]byte, error) }:
@@ -955,7 +955,7 @@ func applyDefaults(m proto.Message) {
 	}
 }
 
-func isAlreadyRegistered(r interface{}) (bool, error) {
+func isAlreadyRegistered(r any) (bool, error) {
 	switch v := r.(type) {
 	case string:
 		return strings.Contains(v, "is already registered") || strings.Contains(v, "duplicate registration"), errors.New(strings.Split(v, "\n")[0])
diff --git a/internal/db/index_test.go b/internal/db/index_test.go
@@ -811,7 +811,7 @@ func schemaEntries(ctx context.Context, db *db, md protoreflect.MessageDescripto
 }
 
 func indexFieldPrefixWithBase(name protoreflect.FullName, fieldPath string, base string) []byte {
-	basePrefix := []byte(fmt.Sprintf("%s/%s/", base, name))
+	basePrefix := fmt.Appendf(nil, "%s/%s/", base, name)
 	fieldBytes := []byte(fieldPath)
 	buf := make([]byte, 4)
 	binary.BigEndian.PutUint32(buf, uint32(len(fieldBytes)))
@@ -825,7 +825,7 @@ func indexFieldPrefixWithBase(name protoreflect.FullName, fieldPath string, base
 func deleteIndexPrefix(ctx context.Context, db *db, md protoreflect.MessageDescriptor) error {
 	var keys [][]byte
 	for _, base := range []string{protodb.Index, protodb.IndexDelta} {
-		prefix := []byte(fmt.Sprintf("%s/%s/", base, md.FullName()))
+		prefix := fmt.Appendf(nil, "%s/%s/", base, md.FullName())
 		if err := db.bdb.View(func(txn *badger.Txn) error {
 			it := txn.NewIterator(badger.IteratorOptions{Prefix: prefix, PrefetchValues: false})
 			defer it.Close()
@@ -856,7 +856,7 @@ func deleteIndexPrefix(ctx context.Context, db *db, md protoreflect.MessageDescr
 func countIndexKeys(db *db, md protoreflect.MessageDescriptor) (int, error) {
 	count := 0
 	for _, base := range []string{protodb.Index, protodb.IndexDelta} {
-		prefix := []byte(fmt.Sprintf("%s/%s/", base, md.FullName()))
+		prefix := fmt.Appendf(nil, "%s/%s/", base, md.FullName())
 		if err := db.bdb.View(func(txn *badger.Txn) error {
 			it := txn.NewIterator(badger.IteratorOptions{Prefix: prefix, PrefetchValues: false})
 			defer it.Close()
diff --git a/internal/index/indexer.go b/internal/index/indexer.go
@@ -386,7 +386,7 @@ func indexHasEntries(ctx context.Context, tx Tx, md protoreflect.MessageDescript
 }
 
 func indexHasPrefix(ctx context.Context, tx badgerd.Tx, md protoreflect.MessageDescriptor, prefix string) (bool, error) {
-	pfx := []byte(fmt.Sprintf("%s/%s/", prefix, md.FullName()))
+	pfx := fmt.Appendf(nil, "%s/%s/", prefix, md.FullName())
 	it := tx.Iterator(badger.IteratorOptions{Prefix: pfx, PrefetchValues: false})
 	defer it.Close()
 	for it.Rewind(); it.Valid(); it.Next() {
@@ -399,7 +399,7 @@ func indexHasPrefix(ctx context.Context, tx badgerd.Tx, md protoreflect.MessageD
 }
 
 func indexSchemaKey(name protoreflect.FullName) []byte {
-	return []byte(fmt.Sprintf("%s/index/%s", protodb.Internal, name))
+	return fmt.Appendf(nil, "%s/index/%s", protodb.Internal, name)
 }
 
 func indexSchemaEntries(ctx context.Context, tx badgerd.Tx, md protoreflect.MessageDescriptor) ([]string, error) {
@@ -520,7 +520,7 @@ func (idx *Indexer) addIndexEntries(ctx context.Context, tx Tx, md protoreflect.
 		return ok, nil
 	}
 	partial := pfindex.New(newTxStore(tx.Txn(), idx.reg), selector)
-	dataPrefix := []byte(fmt.Sprintf("%s/%s/", protodb.Data, md.FullName()))
+	dataPrefix := fmt.Appendf(nil, "%s/%s/", protodb.Data, md.FullName())
 	dataIt := tx.Txn().Iterator(badger.IteratorOptions{Prefix: dataPrefix, PrefetchValues: false})
 	defer dataIt.Close()
 	for dataIt.Rewind(); dataIt.Valid(); dataIt.Next() {
@@ -578,7 +578,7 @@ func entryPath(entry string) string {
 }
 
 func scanIndexKeys(ctx context.Context, tx badgerd.Tx, md protoreflect.MessageDescriptor, removeSet map[string]struct{}, prefix string) ([][]byte, error) {
-	base := []byte(fmt.Sprintf("%s/%s/", prefix, md.FullName()))
+	base := fmt.Appendf(nil, "%s/%s/", prefix, md.FullName())
 	it := tx.Iterator(badger.IteratorOptions{Prefix: base, PrefetchValues: false})
 	defer it.Close()
 	var keys [][]byte
diff --git a/internal/protodb/key.go b/internal/protodb/key.go
@@ -77,7 +77,7 @@ func KeyFor(m proto.Message) (key string, field string, err error) {
 		return "", field, fmt.Errorf("key / id not found in %s", m.ProtoReflect().Type().Descriptor().FullName())
 
 	}
-	switch i := interface{}(m).(type) {
+	switch i := any(m).(type) {
 	case *dynamicpb.Message:
 		var fd protoreflect.FieldDescriptor
 		i.Range(func(descriptor protoreflect.FieldDescriptor, value protoreflect.Value) bool {
diff --git a/internal/protodb/prefix.go b/internal/protodb/prefix.go
@@ -36,11 +36,11 @@ const (
 func DataPrefix(m proto.Message) (key []byte, field string, value string, err error) {
 	k, field, err := KeyFor(m)
 	if err != nil {
-		return []byte(fmt.Sprintf("%s/%s/", Data, m.ProtoReflect().Descriptor().FullName())), field, k, fmt.Errorf("key: %w", err)
+		return fmt.Appendf(nil, "%s/%s/", Data, m.ProtoReflect().Descriptor().FullName()), field, k, fmt.Errorf("key: %w", err)
 	}
-	return []byte(fmt.Sprintf("%s/%s/%s", Data, m.ProtoReflect().Descriptor().FullName(), k)), field, k, nil
+	return fmt.Appendf(nil, "%s/%s/%s", Data, m.ProtoReflect().Descriptor().FullName(), k), field, k, nil
 }
 
 func DescriptorPrefix(d *descriptorpb.FileDescriptorProto) []byte {
-	return []byte(fmt.Sprintf("%s/%s/%s", Descriptors, d.GetPackage(), d.GetName()))
+	return fmt.Appendf(nil, "%s/%s/%s", Descriptors, d.GetPackage(), d.GetName())
 }
diff --git a/tests/cluster.go b/tests/cluster.go
@@ -43,7 +43,7 @@ type Cluster struct {
 func NewCluster(path string, count int, mode protodb.ReplicationMode, opts ...protodb.Option) *Cluster {
 	var addrs []string
 	var ports []int
-	for i := 0; i < count; i++ {
+	for i := range count {
 		offset++
 		ports = append(ports, 18800+offset)
 		addrs = append(addrs, fmt.Sprintf("127.0.0.1:%d", ports[i]))
@@ -55,7 +55,6 @@ func (c *Cluster) StartAll(ctx context.Context) error {
 	g := errgroup.Group{}
 	var mu sync.Mutex
 	for i := range c.dbs {
-		i := i
 		mu.Lock()
 		g.Go(func() error {
 			mu.Unlock()
diff --git a/tests/generics/generics_test.go b/tests/generics/generics_test.go
@@ -15,7 +15,6 @@
 package generics
 
 import (
-	"context"
 	"testing"
 
 	"github.com/sirupsen/logrus"
@@ -27,8 +26,7 @@ import (
 )
 
 func Test(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	db, err := protodb.Open(ctx, protodb.WithPath(":memory:"))
 	if err != nil {
diff --git a/tests/index.go b/tests/index.go
@@ -184,7 +184,7 @@ func TestIndexCRUD(t *testing.T, db protodb.Client) {
 			require.NoError(err)
 			defer tx.Close()
 			step := count / div
-			for i := 0; i < count; i++ {
+			for i := range count {
 				key := fmt.Sprintf("k%06d", i)
 				status := fmt.Sprintf("s%06d", i)
 				_, err = tx.Set(ctx, newIndexCRUDMessage(md, key, status))
@@ -209,7 +209,7 @@ func TestIndexCRUD(t *testing.T, db protodb.Client) {
 			require.NoError(err)
 			defer tx.Close()
 			step := updateCount / div
-			for i := 0; i < updateCount; i++ {
+			for i := range updateCount {
 				id := updateStart + i
 				_, err = tx.Set(ctx, newIndexCRUDMessage(md, fmt.Sprintf("k%06d", id), newStatus))
 				require.NoError(err)
@@ -238,7 +238,7 @@ func TestIndexCRUD(t *testing.T, db protodb.Client) {
 			require.NoError(err)
 			defer tx.Close()
 			step := deleteCount / div
-			for i := 0; i < deleteCount; i++ {
+			for i := range deleteCount {
 				id := updateStart + i
 				require.NoError(tx.Delete(ctx, newIndexCRUDMessage(md, fmt.Sprintf("k%06d", id), newStatus)))
 				if i%step == 0 {
@@ -282,7 +282,7 @@ func TestIndexCreation(t *testing.T, db protodb.Client) {
 		require.NoError(err)
 		defer tx.Close()
 		step := count / div
-		for i := 0; i < count; i++ {
+		for i := range count {
 			key := fmt.Sprintf("k%06d", i)
 			status := fmt.Sprintf("s%06d", i)
 			_, err = tx.Set(ctx, newIndexCreationMessage(mdV1, key, status))
diff --git a/tests/protodb_test.go b/tests/protodb_test.go
diff --git a/tests/tests.go b/tests/tests.go
diff --git a/tools.go b/tools.go

Original file line number	Diff line number	Diff line change
`@@ -27,25 +27,25 @@ type logWrapper struct {`
`27`	`27`	`badger.Logger`
`28`	`28`	`}`
`29`	`29`
`30`		`-func (l *logWrapper) Errorf(s string, i ...interface{}) {`
	`30`	`+func (l *logWrapper) Errorf(s string, i ...any) {`
`31`	`31`	`l.log(l.Logger.Errorf, s, i...)`
`32`	`32`	`}`
`33`	`33`
`34`		`-func (l *logWrapper) Warningf(s string, i ...interface{}) {`
	`34`	`+func (l *logWrapper) Warningf(s string, i ...any) {`
`35`	`35`	`l.log(l.Logger.Warningf, s, i...)`
`36`	`36`	`}`
`37`	`37`
`38`		`-func (l *logWrapper) Infof(s string, i ...interface{}) {`
	`38`	`+func (l *logWrapper) Infof(s string, i ...any) {`
`39`	`39`	`l.log(l.Logger.Infof, s, i...)`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (l *logWrapper) Debugf(s string, i ...interface{}) {`
	`42`	`+func (l *logWrapper) Debugf(s string, i ...any) {`
`43`	`43`	`l.log(l.Logger.Debugf, s, i...)`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (l *logWrapper) log(fn func(string, ...interface{}), s string, i ...interface{}) {`
	`46`	`+func (l *logWrapper) log(fn func(string, ...any), s string, i ...any) {`
`47`	`47`	`msg := fmt.Sprintf(s, i...)`
`48`		`- for _, v := range strings.Split(msg, "\n") {`
	`48`	`+ for v := range strings.SplitSeq(msg, "\n") {`
`49`	`49`	`if v == "" {`
`50`	`50`	`continue`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func TestIterator(t *testing.T) {`
`165`	`165`	`assert.Equal(t, -1, i)`
`166`	`166`	`})`
`167`	`167`
`168`		`- for i := 0; i < count; i++ {`
	`168`	`+ for i := range count {`
`169`	`169`	`w.Delete(initial[i].Key)`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func newEntry(i int, size int64) *badger.Entry {`
`44`	`44`
`45`	`45`	`func genEntries(count int, size int64) []*badger.Entry {`
`46`	`46`	`var entries []*badger.Entry`
`47`		`- for i := 0; i < count; i++ {`
	`47`	`+ for i := range count {`
`48`	`48`	`entries = append(entries, newEntry(i, size))`
`49`	`49`	`}`
`50`	`50`	`return entries`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ func (r *Gossip) loadNodes() ([]string, error) {`
`295`	`295`	`return nil, err`
`296`	`296`	`}`
`297`	`297`	`var nodes []string`
`298`		`- for _, v := range strings.Split(string(b), "\n") {`
	`298`	`+ for v := range strings.SplitSeq(string(b), "\n") {`
`299`	`299`	`if v != "" && v != r.name {`
`300`	`300`	`nodes = append(nodes, v)`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (r Gossip) Init(req pb2.InitRequest, ss pb2.ReplicationService_InitServer`
`46`	`46`	`return gerrs.Internalf("failed to split host port: %v", err)`
`47`	`47`	`}`
`48`	`48`	`var found bool`
`49`		`- for i := 0; i < 100; i++ {`
	`49`	`+ for range 100 {`
`50`	`50`	`for _, v := range r.clients() {`
`51`	`51`	`if found = addr == v.addr.String(); found {`
`52`	`52`	`break`