run gofumpt with option -extra

peczenyj · peczenyj · commit cb78de8c172d · 2024-12-03T07:18:35.000+01:00
diff --git a/bitmap_commands.go b/bitmap_commands.go
@@ -12,7 +12,7 @@ type BitMapCmdable interface {
 	BitOpAnd(ctx context.Context, destKey string, keys ...string) *IntCmd
 	BitOpOr(ctx context.Context, destKey string, keys ...string) *IntCmd
 	BitOpXor(ctx context.Context, destKey string, keys ...string) *IntCmd
-	BitOpNot(ctx context.Context, destKey string, key string) *IntCmd
+	BitOpNot(ctx context.Context, destKey, key string) *IntCmd
 	BitPos(ctx context.Context, key string, bit int64, pos ...int64) *IntCmd
 	BitPosSpan(ctx context.Context, key string, bit int8, start, end int64, span string) *IntCmd
 	BitField(ctx context.Context, key string, values ...interface{}) *IntSliceCmd
@@ -92,7 +92,7 @@ func (c cmdable) BitOpXor(ctx context.Context, destKey string, keys ...string) *
 	return c.bitOp(ctx, "xor", destKey, keys...)
 }
 
-func (c cmdable) BitOpNot(ctx context.Context, destKey string, key string) *IntCmd {
+func (c cmdable) BitOpNot(ctx context.Context, destKey, key string) *IntCmd {
 	return c.bitOp(ctx, "not", destKey, key)
 }
 
diff --git a/cluster_commands.go b/cluster_commands.go
@@ -15,7 +15,7 @@ type ClusterCmdable interface {
 	ClusterResetHard(ctx context.Context) *StatusCmd
 	ClusterInfo(ctx context.Context) *StringCmd
 	ClusterKeySlot(ctx context.Context, key string) *IntCmd
-	ClusterGetKeysInSlot(ctx context.Context, slot int, count int) *StringSliceCmd
+	ClusterGetKeysInSlot(ctx context.Context, slot, count int) *StringSliceCmd
 	ClusterCountFailureReports(ctx context.Context, nodeID string) *IntCmd
 	ClusterCountKeysInSlot(ctx context.Context, slot int) *IntCmd
 	ClusterDelSlots(ctx context.Context, slots ...int) *StatusCmd
@@ -101,7 +101,7 @@ func (c cmdable) ClusterKeySlot(ctx context.Context, key string) *IntCmd {
 	return cmd
 }
 
-func (c cmdable) ClusterGetKeysInSlot(ctx context.Context, slot int, count int) *StringSliceCmd {
+func (c cmdable) ClusterGetKeysInSlot(ctx context.Context, slot, count int) *StringSliceCmd {
 	cmd := NewStringSliceCmd(ctx, "cluster", "getkeysinslot", slot, count)
 	_ = c(ctx, cmd)
 	return cmd
diff --git a/command.go b/command.go
@@ -2020,7 +2020,7 @@ type XInfoConsumer struct {
 
 var _ Cmder = (*XInfoConsumersCmd)(nil)
 
-func NewXInfoConsumersCmd(ctx context.Context, stream string, group string) *XInfoConsumersCmd {
+func NewXInfoConsumersCmd(ctx context.Context, stream, group string) *XInfoConsumersCmd {
 	return &XInfoConsumersCmd{
 		baseCmd: baseCmd{
 			ctx:  ctx,
diff --git a/error.go b/error.go
@@ -111,7 +111,7 @@ func isBadConn(err error, allowTimeout bool, addr string) bool {
 	return true
 }
 
-func isMovedError(err error) (moved bool, ask bool, addr string) {
+func isMovedError(err error) (moved, ask bool, addr string) {
 	if !isRedisError(err) {
 		return
 	}
diff --git a/extra/rediscmd/rediscmd.go b/extra/rediscmd/rediscmd.go
@@ -123,7 +123,7 @@ func appendArg(b []byte, v interface{}) []byte {
 	}
 }
 
-func appendUTF8String(dst []byte, src []byte) []byte {
+func appendUTF8String(dst, src []byte) []byte {
 	if isSimple(src) {
 		dst = append(dst, src...)
 		return dst
diff --git a/extra/rediscmd/rediscmd_test.go b/extra/rediscmd/rediscmd_test.go
@@ -14,7 +14,7 @@ func TestGinkgo(t *testing.T) {
 
 var _ = Describe("AppendArg", func() {
 	DescribeTable("...",
-		func(src string, wanted string) {
+		func(src, wanted string) {
 			b := appendArg(nil, src)
 			Expect(string(b)).To(Equal(wanted))
 		},
diff --git a/gears_commands.go b/gears_commands.go
@@ -12,10 +12,10 @@ type GearsCmdable interface {
 	TFunctionDelete(ctx context.Context, libName string) *StatusCmd
 	TFunctionList(ctx context.Context) *MapStringInterfaceSliceCmd
 	TFunctionListArgs(ctx context.Context, options *TFunctionListOptions) *MapStringInterfaceSliceCmd
-	TFCall(ctx context.Context, libName string, funcName string, numKeys int) *Cmd
-	TFCallArgs(ctx context.Context, libName string, funcName string, numKeys int, options *TFCallOptions) *Cmd
-	TFCallASYNC(ctx context.Context, libName string, funcName string, numKeys int) *Cmd
-	TFCallASYNCArgs(ctx context.Context, libName string, funcName string, numKeys int, options *TFCallOptions) *Cmd
+	TFCall(ctx context.Context, libName, funcName string, numKeys int) *Cmd
+	TFCallArgs(ctx context.Context, libName, funcName string, numKeys int, options *TFCallOptions) *Cmd
+	TFCallASYNC(ctx context.Context, libName, funcName string, numKeys int) *Cmd
+	TFCallASYNCArgs(ctx context.Context, libName, funcName string, numKeys int, options *TFCallOptions) *Cmd
 }
 
 type TFunctionLoadOptions struct {
@@ -98,15 +98,15 @@ func (c cmdable) TFunctionListArgs(ctx context.Context, options *TFunctionListOp
 
 // TFCall - invoke a function.
 // For more information - https://redis.io/commands/tfcall/
-func (c cmdable) TFCall(ctx context.Context, libName string, funcName string, numKeys int) *Cmd {
+func (c cmdable) TFCall(ctx context.Context, libName, funcName string, numKeys int) *Cmd {
 	lf := libName + "." + funcName
 	args := []interface{}{"TFCALL", lf, numKeys}
 	cmd := NewCmd(ctx, args...)
 	_ = c(ctx, cmd)
 	return cmd
 }
 
-func (c cmdable) TFCallArgs(ctx context.Context, libName string, funcName string, numKeys int, options *TFCallOptions) *Cmd {
+func (c cmdable) TFCallArgs(ctx context.Context, libName, funcName string, numKeys int, options *TFCallOptions) *Cmd {
 	lf := libName + "." + funcName
 	args := []interface{}{"TFCALL", lf, numKeys}
 	if options != nil {
@@ -124,15 +124,15 @@ func (c cmdable) TFCallArgs(ctx context.Context, libName string, funcName string
 
 // TFCallASYNC - invoke an asynchronous JavaScript function (coroutine).
 // For more information - https://redis.io/commands/TFCallASYNC/
-func (c cmdable) TFCallASYNC(ctx context.Context, libName string, funcName string, numKeys int) *Cmd {
+func (c cmdable) TFCallASYNC(ctx context.Context, libName, funcName string, numKeys int) *Cmd {
 	lf := fmt.Sprintf("%s.%s", libName, funcName)
 	args := []interface{}{"TFCALLASYNC", lf, numKeys}
 	cmd := NewCmd(ctx, args...)
 	_ = c(ctx, cmd)
 	return cmd
 }
 
-func (c cmdable) TFCallASYNCArgs(ctx context.Context, libName string, funcName string, numKeys int, options *TFCallOptions) *Cmd {
+func (c cmdable) TFCallASYNCArgs(ctx context.Context, libName, funcName string, numKeys int, options *TFCallOptions) *Cmd {
 	lf := fmt.Sprintf("%s.%s", libName, funcName)
 	args := []interface{}{"TFCALLASYNC", lf, numKeys}
 	if options != nil {
diff --git a/generic_commands.go b/generic_commands.go
@@ -40,7 +40,7 @@ type GenericCmdable interface {
 	Touch(ctx context.Context, keys ...string) *IntCmd
 	TTL(ctx context.Context, key string) *DurationCmd
 	Type(ctx context.Context, key string) *StatusCmd
-	Copy(ctx context.Context, sourceKey string, destKey string, db int, replace bool) *IntCmd
+	Copy(ctx context.Context, sourceKey, destKey string, db int, replace bool) *IntCmd
 
 	Scan(ctx context.Context, cursor uint64, match string, count int64) *ScanCmd
 	ScanType(ctx context.Context, cursor uint64, match string, count int64, keyType string) *ScanCmd
diff --git a/geo_commands.go b/geo_commands.go
@@ -15,7 +15,7 @@ type GeoCmdable interface {
 	GeoSearch(ctx context.Context, key string, q *GeoSearchQuery) *StringSliceCmd
 	GeoSearchLocation(ctx context.Context, key string, q *GeoSearchLocationQuery) *GeoSearchLocationCmd
 	GeoSearchStore(ctx context.Context, key, store string, q *GeoSearchStoreQuery) *IntCmd
-	GeoDist(ctx context.Context, key string, member1, member2, unit string) *FloatCmd
+	GeoDist(ctx context.Context, key, member1, member2, unit string) *FloatCmd
 	GeoHash(ctx context.Context, key string, members ...string) *StringSliceCmd
 }
 
@@ -120,7 +120,7 @@ func (c cmdable) GeoSearchStore(ctx context.Context, key, store string, q *GeoSe
 }
 
 func (c cmdable) GeoDist(
-	ctx context.Context, key string, member1, member2, unit string,
+	ctx context.Context, key, member1, member2, unit string,
 ) *FloatCmd {
 	if unit == "" {
 		unit = "km"
diff --git a/internal/arg.go b/internal/arg.go
@@ -52,7 +52,7 @@ func AppendArg(b []byte, v interface{}) []byte {
 	}
 }
 
-func appendUTF8String(dst []byte, src []byte) []byte {
+func appendUTF8String(dst, src []byte) []byte {
 	dst = append(dst, src...)
 	return dst
 }
diff --git a/internal/hscan/hscan.go b/internal/hscan/hscan.go
@@ -73,7 +73,7 @@ func Struct(dst interface{}) (StructValue, error) {
 
 // Scan scans the results from a key-value Redis map result set to a destination struct.
 // The Redis keys are matched to the struct's field with the `redis` tag.
-func Scan(dst interface{}, keys []interface{}, vals []interface{}) error {
+func Scan(dst interface{}, keys, vals []interface{}) error {
 	if len(keys) != len(vals) {
 		return errors.New("args should have the same number of keys and vals")
 	}
diff --git a/internal/hscan/structmap.go b/internal/hscan/structmap.go
@@ -86,7 +86,7 @@ type StructValue struct {
 	value reflect.Value
 }
 
-func (s StructValue) Scan(key string, value string) error {
+func (s StructValue) Scan(key, value string) error {
 	field, ok := s.spec.m[key]
 	if !ok {
 		return nil
diff --git a/internal/util/strconv.go b/internal/util/strconv.go
@@ -6,11 +6,11 @@ func Atoi(b []byte) (int, error) {
 	return strconv.Atoi(BytesToString(b))
 }
 
-func ParseInt(b []byte, base int, bitSize int) (int64, error) {
+func ParseInt(b []byte, base, bitSize int) (int64, error) {
 	return strconv.ParseInt(BytesToString(b), base, bitSize)
 }
 
-func ParseUint(b []byte, base int, bitSize int) (uint64, error) {
+func ParseUint(b []byte, base, bitSize int) (uint64, error) {
 	return strconv.ParseUint(BytesToString(b), base, bitSize)
 }
 
diff --git a/iterator_test.go b/iterator_test.go
@@ -21,7 +21,7 @@ var _ = Describe("ScanIterator", func() {
 		return err
 	}
 
-	extraSeed := func(n int, m int) error {
+	extraSeed := func(n, m int) error {
 		pipe := client.Pipeline()
 		for i := 1; i <= m; i++ {
 			pipe.Set(ctx, fmt.Sprintf("A%02d", i), "x", 0).Err()
diff --git a/json.go b/json.go
@@ -26,7 +26,7 @@ type JSONCmdable interface {
 	JSONForget(ctx context.Context, key, path string) *IntCmd
 	JSONGet(ctx context.Context, key string, paths ...string) *JSONCmd
 	JSONGetWithArgs(ctx context.Context, key string, options *JSONGetArgs, paths ...string) *JSONCmd
-	JSONMerge(ctx context.Context, key, path string, value string) *StatusCmd
+	JSONMerge(ctx context.Context, key, path, value string) *StatusCmd
 	JSONMSetArgs(ctx context.Context, docs []JSONSetArgs) *StatusCmd
 	JSONMSet(ctx context.Context, params ...interface{}) *StatusCmd
 	JSONMGet(ctx context.Context, path string, keys ...string) *JSONSliceCmd
@@ -450,7 +450,7 @@ func (c cmdable) JSONGetWithArgs(ctx context.Context, key string, options *JSONG
 
 // JSONMerge merges a given JSON value into matching paths.
 // For more information, see https://redis.io/commands/json.merge
-func (c cmdable) JSONMerge(ctx context.Context, key, path string, value string) *StatusCmd {
+func (c cmdable) JSONMerge(ctx context.Context, key, path, value string) *StatusCmd {
 	args := []interface{}{"JSON.MERGE", key, path, value}
 	cmd := NewStatusCmd(ctx, args...)
 	_ = c(ctx, cmd)
diff --git a/list_commands.go b/list_commands.go
@@ -19,8 +19,8 @@ type ListCmdable interface {
 	LMPop(ctx context.Context, direction string, count int64, keys ...string) *KeyValuesCmd
 	LPop(ctx context.Context, key string) *StringCmd
 	LPopCount(ctx context.Context, key string, count int) *StringSliceCmd
-	LPos(ctx context.Context, key string, value string, args LPosArgs) *IntCmd
-	LPosCount(ctx context.Context, key string, value string, count int64, args LPosArgs) *IntSliceCmd
+	LPos(ctx context.Context, key, value string, args LPosArgs) *IntCmd
+	LPosCount(ctx context.Context, key, value string, count int64, args LPosArgs) *IntSliceCmd
 	LPush(ctx context.Context, key string, values ...interface{}) *IntCmd
 	LPushX(ctx context.Context, key string, values ...interface{}) *IntCmd
 	LRange(ctx context.Context, key string, start, stop int64) *StringSliceCmd
@@ -152,7 +152,7 @@ type LPosArgs struct {
 	Rank, MaxLen int64
 }
 
-func (c cmdable) LPos(ctx context.Context, key string, value string, a LPosArgs) *IntCmd {
+func (c cmdable) LPos(ctx context.Context, key, value string, a LPosArgs) *IntCmd {
 	args := []interface{}{"lpos", key, value}
 	if a.Rank != 0 {
 		args = append(args, "rank", a.Rank)
@@ -166,7 +166,7 @@ func (c cmdable) LPos(ctx context.Context, key string, value string, a LPosArgs)
 	return cmd
 }
 
-func (c cmdable) LPosCount(ctx context.Context, key string, value string, count int64, a LPosArgs) *IntSliceCmd {
+func (c cmdable) LPosCount(ctx context.Context, key, value string, count int64, a LPosArgs) *IntSliceCmd {
 	args := []interface{}{"lpos", key, value, "count", count}
 	if a.Rank != 0 {
 		args = append(args, "rank", a.Rank)
diff --git a/options.go b/options.go
@@ -59,13 +59,13 @@ type Options struct {
 	Password string
 	// CredentialsProvider allows the username and password to be updated
 	// before reconnecting. It should return the current username and password.
-	CredentialsProvider func() (username string, password string)
+	CredentialsProvider func() (username, password string)
 
 	// CredentialsProviderContext is an enhanced parameter of CredentialsProvider,
 	// done to maintain API compatibility. In the future,
 	// there might be a merge between CredentialsProviderContext and CredentialsProvider.
 	// There will be a conflict between them; if CredentialsProviderContext exists, we will ignore CredentialsProvider.
-	CredentialsProviderContext func(ctx context.Context) (username string, password string, err error)
+	CredentialsProviderContext func(ctx context.Context) (username, password string, err error)
 
 	// Database to be selected after connecting to the server.
 	DB int
diff --git a/osscluster.go b/osscluster.go
@@ -69,8 +69,8 @@ type ClusterOptions struct {
 	Protocol                   int
 	Username                   string
 	Password                   string
-	CredentialsProvider        func() (username string, password string)
-	CredentialsProviderContext func(ctx context.Context) (username string, password string, err error)
+	CredentialsProvider        func() (username, password string)
+	CredentialsProviderContext func(ctx context.Context) (username, password string, err error)
 
 	MaxRetries      int
 	MinRetryBackoff time.Duration
diff --git a/probabilistic.go b/probabilistic.go
@@ -39,9 +39,9 @@ type ProbabilisticCmdable interface {
 	CFMExists(ctx context.Context, key string, elements ...interface{}) *BoolSliceCmd
 	CFReserve(ctx context.Context, key string, capacity int64) *StatusCmd
 	CFReserveWithArgs(ctx context.Context, key string, options *CFReserveOptions) *StatusCmd
-	CFReserveExpansion(ctx context.Context, key string, capacity int64, expansion int64) *StatusCmd
-	CFReserveBucketSize(ctx context.Context, key string, capacity int64, bucketsize int64) *StatusCmd
-	CFReserveMaxIterations(ctx context.Context, key string, capacity int64, maxiterations int64) *StatusCmd
+	CFReserveExpansion(ctx context.Context, key string, capacity, expansion int64) *StatusCmd
+	CFReserveBucketSize(ctx context.Context, key string, capacity, bucketsize int64) *StatusCmd
+	CFReserveMaxIterations(ctx context.Context, key string, capacity, maxiterations int64) *StatusCmd
 	CFScanDump(ctx context.Context, key string, iterator int64) *ScanDumpCmd
 	CFLoadChunk(ctx context.Context, key string, iterator int64, data interface{}) *StatusCmd
 
@@ -61,7 +61,7 @@ type ProbabilisticCmdable interface {
 	TopKListWithCount(ctx context.Context, key string) *MapStringIntCmd
 	TopKQuery(ctx context.Context, key string, elements ...interface{}) *BoolSliceCmd
 	TopKReserve(ctx context.Context, key string, k int64) *StatusCmd
-	TopKReserveWithOptions(ctx context.Context, key string, k int64, width, depth int64, decay float64) *StatusCmd
+	TopKReserveWithOptions(ctx context.Context, key string, k, width, depth int64, decay float64) *StatusCmd
 
 	TDigestAdd(ctx context.Context, key string, elements ...float64) *StatusCmd
 	TDigestByRank(ctx context.Context, key string, rank ...uint64) *FloatSliceCmd
@@ -496,7 +496,7 @@ func (c cmdable) CFReserve(ctx context.Context, key string, capacity int64) *Sta
 
 // CFReserveExpansion creates an empty Cuckoo filter with the specified capacity and expansion rate.
 // For more information - https://redis.io/commands/cf.reserve/
-func (c cmdable) CFReserveExpansion(ctx context.Context, key string, capacity int64, expansion int64) *StatusCmd {
+func (c cmdable) CFReserveExpansion(ctx context.Context, key string, capacity, expansion int64) *StatusCmd {
 	args := []interface{}{"CF.RESERVE", key, capacity, "EXPANSION", expansion}
 	cmd := NewStatusCmd(ctx, args...)
 	_ = c(ctx, cmd)
@@ -505,7 +505,7 @@ func (c cmdable) CFReserveExpansion(ctx context.Context, key string, capacity in
 
 // CFReserveBucketSize creates an empty Cuckoo filter with the specified capacity and bucket size.
 // For more information - https://redis.io/commands/cf.reserve/
-func (c cmdable) CFReserveBucketSize(ctx context.Context, key string, capacity int64, bucketsize int64) *StatusCmd {
+func (c cmdable) CFReserveBucketSize(ctx context.Context, key string, capacity, bucketsize int64) *StatusCmd {
 	args := []interface{}{"CF.RESERVE", key, capacity, "BUCKETSIZE", bucketsize}
 	cmd := NewStatusCmd(ctx, args...)
 	_ = c(ctx, cmd)
@@ -514,7 +514,7 @@ func (c cmdable) CFReserveBucketSize(ctx context.Context, key string, capacity i
 
 // CFReserveMaxIterations creates an empty Cuckoo filter with the specified capacity and maximum number of iterations.
 // For more information - https://redis.io/commands/cf.reserve/
-func (c cmdable) CFReserveMaxIterations(ctx context.Context, key string, capacity int64, maxiterations int64) *StatusCmd {
+func (c cmdable) CFReserveMaxIterations(ctx context.Context, key string, capacity, maxiterations int64) *StatusCmd {
 	args := []interface{}{"CF.RESERVE", key, capacity, "MAXITERATIONS", maxiterations}
 	cmd := NewStatusCmd(ctx, args...)
 	_ = c(ctx, cmd)
@@ -956,7 +956,7 @@ func (c cmdable) TopKReserve(ctx context.Context, key string, k int64) *StatusCm
 // TopKReserveWithOptions creates an empty Top-K filter with the specified number of top items to keep and additional options.
 // This function allows for specifying additional options such as width, depth and decay.
 // For more information - https://redis.io/commands/topk.reserve/
-func (c cmdable) TopKReserveWithOptions(ctx context.Context, key string, k int64, width, depth int64, decay float64) *StatusCmd {
+func (c cmdable) TopKReserveWithOptions(ctx context.Context, key string, k, width, depth int64, decay float64) *StatusCmd {
 	args := []interface{}{"TOPK.RESERVE", key, k, width, depth, decay}
 
 	cmd := NewStatusCmd(ctx, args...)
diff --git a/scripting_commands.go b/scripting_commands.go
@@ -201,7 +201,7 @@ func (c cmdable) FCallRO(ctx context.Context, function string, keys []string, ar
 	return cmd
 }
 
-func fcallArgs(command string, function string, keys []string, args ...interface{}) []interface{} {
+func fcallArgs(command, function string, keys []string, args ...interface{}) []interface{} {
 	cmdArgs := make([]interface{}, 3+len(keys), 3+len(keys)+len(args))
 	cmdArgs[0] = command
 	cmdArgs[1] = function
diff --git a/stream_commands.go b/stream_commands.go
diff --git a/timeseries_commands.go b/timeseries_commands.go

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func isBadConn(err error, allowTimeout bool, addr string) bool {`
`111`	`111`	`return true`
`112`	`112`	`}`
`113`	`113`
`114`		`-func isMovedError(err error) (moved bool, ask bool, addr string) {`
	`114`	`+func isMovedError(err error) (moved, ask bool, addr string) {`
`115`	`115`	`if !isRedisError(err) {`
`116`	`116`	`return`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func appendArg(b []byte, v interface{}) []byte {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`-func appendUTF8String(dst []byte, src []byte) []byte {`
	`126`	`+func appendUTF8String(dst, src []byte) []byte {`
`127`	`127`	`if isSimple(src) {`
`128`	`128`	`dst = append(dst, src...)`
`129`	`129`	`return dst`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func AppendArg(b []byte, v interface{}) []byte {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-func appendUTF8String(dst []byte, src []byte) []byte {`
	`55`	`+func appendUTF8String(dst, src []byte) []byte {`
`56`	`56`	`dst = append(dst, src...)`
`57`	`57`	`return dst`
`58`	`58`	`}`