Skip to content

refactor: replace interface{} with any (Go 1.18+) #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hjr265 merged 1 commit into from
Jul 2, 2026
Merged

refactor: replace interface{} with any (Go 1.18+) #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redis/goredis/goredis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion redis/goredis/v7/goredis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion redis/goredis/v8/goredis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion redis/goredis/v9/goredis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions redis/redigo/redigo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)...)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion redis/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion redis/rueidis/rueidis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion redis/valkeygo/valkeygo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down