Address several golangci-lint/staticcheck warnings

Author: ofekshenawa

command.go

@@ -1412,7 +1412,8 @@ func (cmd *MapStringSliceInterfaceCmd) readReply(rd *proto.Reader) (err error) {
 
 	cmd.val = make(map[string][]interface{})
 
-	if readType == proto.RespMap {
+	switch readType {
+	case proto.RespMap:
 		n, err := rd.ReadMapLen()
 		if err != nil {
 			return err
@@ -1435,7 +1436,7 @@ func (cmd *MapStringSliceInterfaceCmd) readReply(rd *proto.Reader) (err error) {
 				cmd.val[k][j] = value
 			}
 		}
-	} else if readType == proto.RespArray {
+	case proto.RespArray:
 		// RESP2 response
 		n, err := rd.ReadArrayLen()
 		if err != nil {

extra/rediscensus/go.mod

@@ -19,6 +19,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )

extra/rediscmd/go.mod

@@ -16,6 +16,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )

extra/redisotel/go.mod

@@ -24,6 +24,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )

extra/redisprometheus/go.mod

@@ -23,6 +23,6 @@ require (
 )
 
 retract (
-	v9.5.3 // This version was accidentally released.
 	v9.7.2 // This version was accidentally released.
+	v9.5.3 // This version was accidentally released.
 )

json.go

@@ -113,7 +113,7 @@ func (cmd *JSONCmd) Expanded() (interface{}, error) {
 
 func (cmd *JSONCmd) readReply(rd *proto.Reader) error {
 	// nil response from JSON.(M)GET (cmd.baseCmd.err will be "redis: nil")
-	if cmd.baseCmd.Err() == Nil {
+	if cmd.Err() == Nil {
 		cmd.val = ""
 		return Nil
 	}
@@ -182,7 +182,7 @@ func (cmd *JSONSliceCmd) Result() ([]interface{}, error) {
 }
 
 func (cmd *JSONSliceCmd) readReply(rd *proto.Reader) error {
-	if cmd.baseCmd.Err() == Nil {
+	if cmd.Err() == Nil {
 		cmd.val = nil
 		return Nil
 	}

options.go

@@ -214,9 +214,10 @@ func (opt *Options) init() {
 		opt.ConnMaxIdleTime = 30 * time.Minute
 	}
 
-	if opt.MaxRetries == -1 {
+	switch opt.MaxRetries {
+	case -1:
 		opt.MaxRetries = 0
-	} else if opt.MaxRetries == 0 {
+	case 0:
 		opt.MaxRetries = 3
 	}
 	switch opt.MinRetryBackoff {

osscluster.go

@@ -111,9 +111,10 @@ type ClusterOptions struct {
 }
 
 func (opt *ClusterOptions) init() {
-	if opt.MaxRedirects == -1 {
+	switch opt.MaxRedirects {
+	case -1:
 		opt.MaxRedirects = 0
-	} else if opt.MaxRedirects == 0 {
+	case 0:
 		opt.MaxRedirects = 3
 	}
 

redis.go

@@ -677,16 +677,16 @@ func NewClient(opt *Options) *Client {
 func (c *Client) init() {
 	c.cmdable = c.Process
 	c.initHooks(hooks{
-		dial:       c.baseClient.dial,
-		process:    c.baseClient.process,
-		pipeline:   c.baseClient.processPipeline,
-		txPipeline: c.baseClient.processTxPipeline,
+		dial:       c.dial,
+		process:    c.process,
+		pipeline:   c.processPipeline,
+		txPipeline: c.processTxPipeline,
 	})
 }
 
 func (c *Client) WithTimeout(timeout time.Duration) *Client {
 	clone := *c
-	clone.baseClient = c.baseClient.withTimeout(timeout)
+	clone.baseClient = c.withTimeout(timeout)
 	clone.init()
 	return &clone
 }
@@ -839,10 +839,10 @@ func newConn(opt *Options, connPool pool.Pooler) *Conn {
 	c.cmdable = c.Process
 	c.statefulCmdable = c.Process
 	c.initHooks(hooks{
-		dial:       c.baseClient.dial,
-		process:    c.baseClient.process,
-		pipeline:   c.baseClient.processPipeline,
-		txPipeline: c.baseClient.processTxPipeline,
+		dial:       c.dial,
+		process:    c.process,
+		pipeline:   c.processPipeline,
+		txPipeline: c.processTxPipeline,
 	})
 
 	return &c

ring.go

@@ -128,9 +128,10 @@ func (opt *RingOptions) init() {
 		opt.NewConsistentHash = newRendezvous
 	}
 
-	if opt.MaxRetries == -1 {
+	switch opt.MaxRetries {
+	case -1:
 		opt.MaxRetries = 0
-	} else if opt.MaxRetries == 0 {
+	case 0:
 		opt.MaxRetries = 3
 	}
 	switch opt.MinRetryBackoff {

sentinel.go

@@ -321,8 +321,8 @@ func NewSentinelClient(opt *Options) *SentinelClient {
 	}
 
 	c.initHooks(hooks{
-		dial:    c.baseClient.dial,
-		process: c.baseClient.process,
+		dial:    c.dial,
+		process: c.process,
 	})
 	c.connPool = newConnPool(opt, c.dialHook)
 

tx.go

@@ -39,10 +39,10 @@ func (c *Tx) init() {
 	c.statefulCmdable = c.Process
 
 	c.initHooks(hooks{
-		dial:       c.baseClient.dial,
-		process:    c.baseClient.process,
-		pipeline:   c.baseClient.processPipeline,
-		txPipeline: c.baseClient.processTxPipeline,
+		dial:       c.dial,
+		process:    c.process,
+		pipeline:   c.processPipeline,
+		txPipeline: c.processTxPipeline,
 	})
 }