diff --git a/redis/goredis/goredis.go b/redis/goredis/goredis.go index 75f58a8..4fd90bf 100644 --- a/redis/goredis/goredis.go +++ b/redis/goredis/goredis.go @@ -50,7 +50,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return expiry, noErrNil(err) } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs diff --git a/redis/goredis/v7/goredis.go b/redis/goredis/v7/goredis.go index 90e0f71..28c5560 100644 --- a/redis/goredis/v7/goredis.go +++ b/redis/goredis/v7/goredis.go @@ -53,7 +53,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return c.delegate.PTTL(name).Result() } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs diff --git a/redis/goredis/v8/goredis.go b/redis/goredis/v8/goredis.go index 3c1330e..05b5a82 100644 --- a/redis/goredis/v8/goredis.go +++ b/redis/goredis/v8/goredis.go @@ -48,7 +48,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return c.delegate.PTTL(c.ctx, name).Result() } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs diff --git a/redis/goredis/v9/goredis.go b/redis/goredis/v9/goredis.go index 47c4939..8a29077 100644 --- a/redis/goredis/v9/goredis.go +++ b/redis/goredis/v9/goredis.go @@ -48,7 +48,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return c.delegate.PTTL(c.ctx, name).Result() } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs diff --git a/redis/redigo/redigo.go b/redis/redigo/redigo.go index dd431ce..127370b 100644 --- a/redis/redigo/redigo.go +++ b/redis/redigo/redigo.go @@ -58,7 +58,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return time.Duration(expiry) * time.Millisecond, noErrNil(err) } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { v, err := c.delegate.Do("EVALSHA", args(script, script.Hash, keysAndArgs)...) if e, ok := err.(redis.Error); ok && strings.HasPrefix(string(e), "NOSCRIPT ") { v, err = c.delegate.Do("EVAL", args(script, script.Src, keysAndArgs)...) @@ -86,14 +86,14 @@ func noErrNil(err error) error { return nil } -func args(script *redsyncredis.Script, spec string, keysAndArgs []interface{}) []interface{} { - var args []interface{} +func args(script *redsyncredis.Script, spec string, keysAndArgs []any) []any { + var args []any if script.KeyCount < 0 { - args = make([]interface{}, 1+len(keysAndArgs)) + args = make([]any, 1+len(keysAndArgs)) args[0] = spec copy(args[1:], keysAndArgs) } else { - args = make([]interface{}, 2+len(keysAndArgs)) + args = make([]any, 2+len(keysAndArgs)) args[0] = spec args[1] = script.KeyCount copy(args[2:], keysAndArgs) diff --git a/redis/redis.go b/redis/redis.go index cb4e339..cbae677 100644 --- a/redis/redis.go +++ b/redis/redis.go @@ -15,7 +15,7 @@ type Conn interface { Get(name string) (string, error) Set(name string, value string) (bool, error) SetNX(name string, value string, expiry time.Duration) (bool, error) - Eval(script *Script, keysAndArgs ...interface{}) (interface{}, error) + Eval(script *Script, keysAndArgs ...any) (any, error) ScriptLoad(script *Script) error PTTL(name string) (time.Duration, error) Close() error diff --git a/redis/rueidis/rueidis.go b/redis/rueidis/rueidis.go index c42cae2..ce9601a 100644 --- a/redis/rueidis/rueidis.go +++ b/redis/rueidis/rueidis.go @@ -50,7 +50,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return c.delegate.PTTL(c.ctx, name).Result() } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs diff --git a/redis/valkeygo/valkeygo.go b/redis/valkeygo/valkeygo.go index 647960a..426ea5a 100644 --- a/redis/valkeygo/valkeygo.go +++ b/redis/valkeygo/valkeygo.go @@ -49,7 +49,7 @@ func (c *conn) PTTL(name string) (time.Duration, error) { return c.delegate.PTTL(c.ctx, name).Result() } -func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...interface{}) (interface{}, error) { +func (c *conn) Eval(script *redsyncredis.Script, keysAndArgs ...any) (any, error) { keys := make([]string, script.KeyCount) args := keysAndArgs