Merge pull request #171 from extemporalgenome/go122-loops

hjr265 · web-flow · commit 62b6e6dbb74e · 2025-06-23T19:58:44.000+06:00
use go1.22 loops
diff --git a/mutex.go b/mutex.go
@@ -83,7 +83,7 @@ func (m *Mutex) lockContext(ctx context.Context, tries int) error {
 	}
 
 	var timer *time.Timer
-	for i := 0; i < tries; i++ {
+	for i := range tries {
 		if i != 0 {
 			if timer == nil {
 				timer = time.NewTimer(m.delayFunc(i))
diff --git a/mutex_test.go b/mutex_test.go
@@ -18,21 +18,19 @@ func TestMutex(t *testing.T) {
 		t.Run(k, func(t *testing.T) {
 			mutexes := newTestMutexes(v.pools, k+"-test-mutex", v.poolCount)
 			eg := errgroup.Group{}
-			for i, mutex := range mutexes {
-				func(i int, mutex *Mutex) {
-					eg.Go(func() error {
-						err := mutex.Lock()
-						if err != nil {
-							return err
-						}
-						defer mutex.Unlock()
+			for _, mutex := range mutexes {
+				eg.Go(func() error {
+					err := mutex.Lock()
+					if err != nil {
+						return err
+					}
+					defer mutex.Unlock()
 
-						if !isAcquired(ctx, v.pools, mutex) {
-							return fmt.Errorf("Expected n >= %d, got %d", mutex.quorum, countAcquiredPools(ctx, v.pools, mutex))
-						}
-						return nil
-					})
-				}(i, mutex)
+					if !isAcquired(ctx, v.pools, mutex) {
+						return fmt.Errorf("Expected n >= %d, got %d", mutex.quorum, countAcquiredPools(ctx, v.pools, mutex))
+					}
+					return nil
+				})
 			}
 			err := eg.Wait()
 			if err != nil {
@@ -48,31 +46,29 @@ func TestTryLock(t *testing.T) {
 		t.Run(k, func(t *testing.T) {
 			mutexes := newTestMutexes(v.pools, k+"-test-trylock", v.poolCount)
 			eg := errgroup.Group{}
-			for i, mutex := range mutexes {
-				func(i int, mutex *Mutex) {
-					eg.Go(func() error {
-						err := mutex.TryLockContext(context.Background())
-						for {
-							if err == nil {
-								break
-							}
-
-							time.Sleep(100 * time.Millisecond) // 1ms
+			for _, mutex := range mutexes {
+				eg.Go(func() error {
+					err := mutex.TryLockContext(context.Background())
+					for {
+						if err == nil {
+							break
 						}
 
-						ok, err := mutex.Extend()
-						if err != nil || !ok {
-							t.Fatalf("extend failed: %v", err)
-						}
+						time.Sleep(100 * time.Millisecond) // 1ms
+					}
+
+					ok, err := mutex.Extend()
+					if err != nil || !ok {
+						t.Fatalf("extend failed: %v", err)
+					}
 
-						defer mutex.Unlock()
+					defer mutex.Unlock()
 
-						if !isAcquired(ctx, v.pools, mutex) {
-							return fmt.Errorf("Expected n >= %d, got %d", mutex.quorum, countAcquiredPools(ctx, v.pools, mutex))
-						}
-						return nil
-					})
-				}(i, mutex)
+					if !isAcquired(ctx, v.pools, mutex) {
+						return fmt.Errorf("Expected n >= %d, got %d", mutex.quorum, countAcquiredPools(ctx, v.pools, mutex))
+					}
+					return nil
+				})
 			}
 			err := eg.Wait()
 			if err != nil {
@@ -250,7 +246,7 @@ func TestMutexQuorum(t *testing.T) {
 	ctx := context.Background()
 	for k, v := range makeCases(4) {
 		t.Run(k, func(t *testing.T) {
-			for mask := 0; mask < 1<<uint(len(v.pools)); mask++ {
+			for mask := range 1 << len(v.pools) {
 				mutexes := newTestMutexes(v.pools, k+"-test-mutex-partial-"+strconv.Itoa(mask), 1)
 				mutex := mutexes[0]
 				mutex.tries = 1
@@ -387,7 +383,7 @@ func clogPools(pools []redis.Pool, mask int, mutex *Mutex) int {
 
 func newTestMutexes(pools []redis.Pool, name string, n int) []*Mutex {
 	mutexes := make([]*Mutex, n)
-	for i := 0; i < n; i++ {
+	for i := range n {
 		mutexes[i] = &Mutex{
 			name:          name + "-" + strconv.Itoa(i),
 			expiry:        8 * time.Second,
diff --git a/redis/goredis/goredis.go b/redis/goredis/goredis.go
@@ -55,7 +55,7 @@ func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (in
 	args := keysAndArgs
 
 	if script.KeyCount > 0 {
-		for i := 0; i < script.KeyCount; i++ {
+		for i := range script.KeyCount {
 			keys[i] = keysAndArgs[i].(string)
 		}
 
diff --git a/redis/goredis/v7/goredis.go b/redis/goredis/v7/goredis.go
@@ -58,7 +58,7 @@ func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (in
 	args := keysAndArgs
 
 	if script.KeyCount > 0 {
-		for i := 0; i < script.KeyCount; i++ {
+		for i := range script.KeyCount {
 			keys[i] = keysAndArgs[i].(string)
 		}
 		args = keysAndArgs[script.KeyCount:]
diff --git a/redis/goredis/v8/goredis.go b/redis/goredis/v8/goredis.go
@@ -53,7 +53,7 @@ func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (in
 	args := keysAndArgs
 
 	if script.KeyCount > 0 {
-		for i := 0; i < script.KeyCount; i++ {
+		for i := range script.KeyCount {
 			keys[i] = keysAndArgs[i].(string)
 		}
 		args = keysAndArgs[script.KeyCount:]
diff --git a/redis/goredis/v9/goredis.go b/redis/goredis/v9/goredis.go
@@ -53,7 +53,7 @@ func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (in
 	args := keysAndArgs
 
 	if script.KeyCount > 0 {
-		for i := 0; i < script.KeyCount; i++ {
+		for i := range script.KeyCount {
 			keys[i] = keysAndArgs[i].(string)
 		}
 		args = keysAndArgs[script.KeyCount:]
diff --git a/redis/rueidis/rueidis.go b/redis/rueidis/rueidis.go
@@ -55,7 +55,7 @@ func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (in
 	args := keysAndArgs
 
 	if script.KeyCount > 0 {
-		for i := 0; i < script.KeyCount; i++ {
+		for i := range script.KeyCount {
 			keys[i] = keysAndArgs[i].(string)
 		}
 		args = keysAndArgs[script.KeyCount:]
diff --git a/redsync_test.go b/redsync_test.go
@@ -73,7 +73,7 @@ const (
 )
 
 func TestMain(m *testing.M) {
-	for i := 0; i < ServerPoolSize*ServerPools; i++ {
+	for i := range ServerPoolSize * ServerPools {
 		server, err := tempredis.Start(tempredis.Config{
 			"port": strconv.Itoa(51200 + i),
 		})
@@ -107,7 +107,7 @@ func newMockPoolsRedigo(n int) []redis.Pool {
 
 	offset := RedigoBlock * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		server := servers[i+offset]
 		pools[i] = redigo.NewPool(&redigolib.Pool{
 			MaxIdle:     3,
@@ -129,7 +129,7 @@ func newMockPoolsGoredis(n int) []redis.Pool {
 
 	offset := GoredisBlock * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		client := goredislib.NewClient(&goredislib.Options{
 			Network: "unix",
 			Addr:    servers[i+offset].Socket(),
@@ -144,7 +144,7 @@ func newMockPoolsGoredisV7(n int) []redis.Pool {
 
 	offset := GoredisV7Block * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		client := goredislib_v7.NewClient(&goredislib_v7.Options{
 			Network: "unix",
 			Addr:    servers[i+offset].Socket(),
@@ -159,7 +159,7 @@ func newMockPoolsGoredisV8(n int) []redis.Pool {
 
 	offset := GoredisV8Block * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		client := goredislib_v8.NewClient(&goredislib_v8.Options{
 			Network: "unix",
 			Addr:    servers[i+offset].Socket(),
@@ -174,7 +174,7 @@ func newMockPoolsGoredisV9(n int) []redis.Pool {
 
 	offset := GoredisV9Block * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		client := goredislib_v9.NewClient(&goredislib_v9.Options{
 			Network: "unix",
 			Addr:    servers[i+offset].Socket(),
@@ -189,7 +189,7 @@ func newMockPoolsRueidis(n int) []redis.Pool {
 
 	offset := RueidisBlock * ServerPoolSize
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		client, err := rueidislib.NewClient(rueidislib.ClientOption{
 			InitAddress: []string{"127.0.0.1:" + strconv.Itoa(51200+i+offset)},
 		})

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (m *Mutex) lockContext(ctx context.Context, tries int) error {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`var timer *time.Timer`
`86`		`- for i := 0; i < tries; i++ {`
	`86`	`+ for i := range tries {`
`87`	`87`	`if i != 0 {`
`88`	`88`	`if timer == nil {`
`89`	`89`	`timer = time.NewTimer(m.delayFunc(i))`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (c conn) Eval(script redsyncredis.Script, keysAndArgs ...interface{}) (in`
`55`	`55`	`args := keysAndArgs`
`56`	`56`
`57`	`57`	`if script.KeyCount > 0 {`
`58`		`- for i := 0; i < script.KeyCount; i++ {`
	`58`	`+ for i := range script.KeyCount {`
`59`	`59`	`keys[i] = keysAndArgs[i].(string)`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func (c conn) Eval(script redsyncredis.Script, keysAndArgs ...interface{}) (in`
`58`	`58`	`args := keysAndArgs`
`59`	`59`
`60`	`60`	`if script.KeyCount > 0 {`
`61`		`- for i := 0; i < script.KeyCount; i++ {`
	`61`	`+ for i := range script.KeyCount {`
`62`	`62`	`keys[i] = keysAndArgs[i].(string)`
`63`	`63`	`}`
`64`	`64`	`args = keysAndArgs[script.KeyCount:]`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (c conn) Eval(script redsyncredis.Script, keysAndArgs ...interface{}) (in`
`53`	`53`	`args := keysAndArgs`
`54`	`54`
`55`	`55`	`if script.KeyCount > 0 {`
`56`		`- for i := 0; i < script.KeyCount; i++ {`
	`56`	`+ for i := range script.KeyCount {`
`57`	`57`	`keys[i] = keysAndArgs[i].(string)`
`58`	`58`	`}`
`59`	`59`	`args = keysAndArgs[script.KeyCount:]`