Cleanup

vmihailenco · vmihailenco · commit 577621667774 · 2019-08-24T11:55:13.000+03:00
diff --git a/command.go b/command.go
@@ -17,11 +17,10 @@ type Cmder interface {
 	Args() []interface{}
 	stringArg(int) string
 
-	readReply(rd *proto.Reader) error
-	setErr(error)
-
 	readTimeout() *time.Duration
+	readReply(rd *proto.Reader) error
 
+	setErr(error)
 	Err() error
 }
 
@@ -92,31 +91,31 @@ func cmdFirstKeyPos(cmd Cmder, info *CommandInfo) int {
 //------------------------------------------------------------------------------
 
 type baseCmd struct {
-	_args []interface{}
-	err   error
+	args []interface{}
+	err  error
 
 	_readTimeout *time.Duration
 }
 
 var _ Cmder = (*Cmd)(nil)
 
 func (cmd *baseCmd) Name() string {
-	if len(cmd._args) == 0 {
+	if len(cmd.args) == 0 {
 		return ""
 	}
 	// Cmd name must be lower cased.
 	return internal.ToLower(cmd.stringArg(0))
 }
 
 func (cmd *baseCmd) Args() []interface{} {
-	return cmd._args
+	return cmd.args
 }
 
 func (cmd *baseCmd) stringArg(pos int) string {
-	if pos < 0 || pos >= len(cmd._args) {
+	if pos < 0 || pos >= len(cmd.args) {
 		return ""
 	}
-	s, _ := cmd._args[pos].(string)
+	s, _ := cmd.args[pos].(string)
 	return s
 }
 
@@ -146,7 +145,7 @@ type Cmd struct {
 
 func NewCmd(args ...interface{}) *Cmd {
 	return &Cmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -303,7 +302,7 @@ var _ Cmder = (*SliceCmd)(nil)
 
 func NewSliceCmd(args ...interface{}) *SliceCmd {
 	return &SliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -341,7 +340,7 @@ var _ Cmder = (*StatusCmd)(nil)
 
 func NewStatusCmd(args ...interface{}) *StatusCmd {
 	return &StatusCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -374,7 +373,7 @@ var _ Cmder = (*IntCmd)(nil)
 
 func NewIntCmd(args ...interface{}) *IntCmd {
 	return &IntCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -407,7 +406,7 @@ var _ Cmder = (*IntSliceCmd)(nil)
 
 func NewIntSliceCmd(args ...interface{}) *IntSliceCmd {
 	return &IntSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -451,7 +450,7 @@ var _ Cmder = (*DurationCmd)(nil)
 
 func NewDurationCmd(precision time.Duration, args ...interface{}) *DurationCmd {
 	return &DurationCmd{
-		baseCmd:   baseCmd{_args: args},
+		baseCmd:   baseCmd{args: args},
 		precision: precision,
 	}
 }
@@ -497,7 +496,7 @@ var _ Cmder = (*TimeCmd)(nil)
 
 func NewTimeCmd(args ...interface{}) *TimeCmd {
 	return &TimeCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -547,7 +546,7 @@ var _ Cmder = (*BoolCmd)(nil)
 
 func NewBoolCmd(args ...interface{}) *BoolCmd {
 	return &BoolCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -601,7 +600,7 @@ var _ Cmder = (*StringCmd)(nil)
 
 func NewStringCmd(args ...interface{}) *StringCmd {
 	return &StringCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -691,7 +690,7 @@ var _ Cmder = (*FloatCmd)(nil)
 
 func NewFloatCmd(args ...interface{}) *FloatCmd {
 	return &FloatCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -724,7 +723,7 @@ var _ Cmder = (*StringSliceCmd)(nil)
 
 func NewStringSliceCmd(args ...interface{}) *StringSliceCmd {
 	return &StringSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -774,7 +773,7 @@ var _ Cmder = (*BoolSliceCmd)(nil)
 
 func NewBoolSliceCmd(args ...interface{}) *BoolSliceCmd {
 	return &BoolSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -817,7 +816,7 @@ var _ Cmder = (*StringStringMapCmd)(nil)
 
 func NewStringStringMapCmd(args ...interface{}) *StringStringMapCmd {
 	return &StringStringMapCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -866,7 +865,7 @@ var _ Cmder = (*StringIntMapCmd)(nil)
 
 func NewStringIntMapCmd(args ...interface{}) *StringIntMapCmd {
 	return &StringIntMapCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -915,7 +914,7 @@ var _ Cmder = (*StringStructMapCmd)(nil)
 
 func NewStringStructMapCmd(args ...interface{}) *StringStructMapCmd {
 	return &StringStructMapCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -963,7 +962,7 @@ var _ Cmder = (*XMessageSliceCmd)(nil)
 
 func NewXMessageSliceCmd(args ...interface{}) *XMessageSliceCmd {
 	return &XMessageSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1054,7 +1053,7 @@ var _ Cmder = (*XStreamSliceCmd)(nil)
 
 func NewXStreamSliceCmd(args ...interface{}) *XStreamSliceCmd {
 	return &XStreamSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1123,7 +1122,7 @@ var _ Cmder = (*XPendingCmd)(nil)
 
 func NewXPendingCmd(args ...interface{}) *XPendingCmd {
 	return &XPendingCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1222,7 +1221,7 @@ var _ Cmder = (*XPendingExtCmd)(nil)
 
 func NewXPendingExtCmd(args ...interface{}) *XPendingExtCmd {
 	return &XPendingExtCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1296,7 +1295,7 @@ var _ Cmder = (*ZSliceCmd)(nil)
 
 func NewZSliceCmd(args ...interface{}) *ZSliceCmd {
 	return &ZSliceCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1348,7 +1347,7 @@ var _ Cmder = (*ZWithKeyCmd)(nil)
 
 func NewZWithKeyCmd(args ...interface{}) *ZWithKeyCmd {
 	return &ZWithKeyCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1408,7 +1407,7 @@ var _ Cmder = (*ScanCmd)(nil)
 
 func NewScanCmd(process func(cmd Cmder) error, args ...interface{}) *ScanCmd {
 	return &ScanCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 		process: process,
 	}
 }
@@ -1460,7 +1459,7 @@ var _ Cmder = (*ClusterSlotsCmd)(nil)
 
 func NewClusterSlotsCmd(args ...interface{}) *ClusterSlotsCmd {
 	return &ClusterSlotsCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1577,7 +1576,7 @@ var _ Cmder = (*GeoLocationCmd)(nil)
 
 func NewGeoLocationCmd(q *GeoRadiusQuery, args ...interface{}) *GeoLocationCmd {
 	return &GeoLocationCmd{
-		baseCmd: baseCmd{_args: geoLocationArgs(q, args...)},
+		baseCmd: baseCmd{args: geoLocationArgs(q, args...)},
 		q:       q,
 	}
 }
@@ -1721,7 +1720,7 @@ var _ Cmder = (*GeoPosCmd)(nil)
 
 func NewGeoPosCmd(args ...interface{}) *GeoPosCmd {
 	return &GeoPosCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
@@ -1795,7 +1794,7 @@ var _ Cmder = (*CommandsInfoCmd)(nil)
 
 func NewCommandsInfoCmd(args ...interface{}) *CommandsInfoCmd {
 	return &CommandsInfoCmd{
-		baseCmd: baseCmd{_args: args},
+		baseCmd: baseCmd{args: args},
 	}
 }
 
diff --git a/iterator.go b/iterator.go
@@ -43,10 +43,10 @@ func (it *ScanIterator) Next() bool {
 		}
 
 		// Fetch next page.
-		if it.cmd._args[0] == "scan" {
-			it.cmd._args[1] = it.cmd.cursor
+		if it.cmd.args[0] == "scan" {
+			it.cmd.args[1] = it.cmd.cursor
 		} else {
-			it.cmd._args[2] = it.cmd.cursor
+			it.cmd.args[2] = it.cmd.cursor
 		}
 
 		err := it.cmd.process(it.cmd)
diff --git a/redis.go b/redis.go
@@ -46,7 +46,7 @@ func (hs hooks) process(
 
 	cmdErr := fn(ctx, cmd)
 
-	_, err = hs.afterProcess(ctx, cmd)
+	err = hs.afterProcess(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -65,15 +65,15 @@ func (hs hooks) beforeProcess(ctx context.Context, cmd Cmder) (context.Context,
 	return ctx, nil
 }
 
-func (hs hooks) afterProcess(ctx context.Context, cmd Cmder) (context.Context, error) {
+func (hs hooks) afterProcess(ctx context.Context, cmd Cmder) error {
 	var firstErr error
 	for _, h := range hs.hooks {
 		err := h.AfterProcess(ctx, cmd)
 		if err != nil && firstErr == nil {
 			firstErr = err
 		}
 	}
-	return ctx, firstErr
+	return firstErr
 }
 
 func (hs hooks) processPipeline(
@@ -86,7 +86,7 @@ func (hs hooks) processPipeline(
 
 	cmdsErr := fn(ctx, cmds)
 
-	_, err = hs.afterProcessPipeline(ctx, cmds)
+	err = hs.afterProcessPipeline(ctx, cmds)
 	if err != nil {
 		return err
 	}
@@ -105,15 +105,15 @@ func (hs hooks) beforeProcessPipeline(ctx context.Context, cmds []Cmder) (contex
 	return ctx, nil
 }
 
-func (hs hooks) afterProcessPipeline(ctx context.Context, cmds []Cmder) (context.Context, error) {
+func (hs hooks) afterProcessPipeline(ctx context.Context, cmds []Cmder) error {
 	var firstErr error
 	for _, h := range hs.hooks {
 		err := h.AfterProcessPipeline(ctx, cmds)
 		if err != nil && firstErr == nil {
 			firstErr = err
 		}
 	}
-	return ctx, firstErr
+	return firstErr
 }
 
 //------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,10 @@ type Cmder interface {`
`17`	`17`	`Args() []interface{}`
`18`	`18`	`stringArg(int) string`
`19`	`19`
`20`		`- readReply(rd *proto.Reader) error`
`21`		`- setErr(error)`
`22`		`-`
`23`	`20`	`readTimeout() *time.Duration`
	`21`	`+ readReply(rd *proto.Reader) error`
`24`	`22`
	`23`	`+ setErr(error)`
`25`	`24`	`Err() error`
`26`	`25`	`}`
`27`	`26`
`@@ -92,31 +91,31 @@ func cmdFirstKeyPos(cmd Cmder, info *CommandInfo) int {`
`92`	`91`	`//------------------------------------------------------------------------------`
`93`	`92`
`94`	`93`	`type baseCmd struct {`
`95`		`- _args []interface{}`
`96`		`- err error`
	`94`	`+ args []interface{}`
	`95`	`+ err error`
`97`	`96`
`98`	`97`	`_readTimeout *time.Duration`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`var _ Cmder = (*Cmd)(nil)`
`102`	`101`
`103`	`102`	`func (cmd *baseCmd) Name() string {`
`104`		`- if len(cmd._args) == 0 {`
	`103`	`+ if len(cmd.args) == 0 {`
`105`	`104`	`return ""`
`106`	`105`	`}`
`107`	`106`	`// Cmd name must be lower cased.`
`108`	`107`	`return internal.ToLower(cmd.stringArg(0))`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`func (cmd *baseCmd) Args() []interface{} {`
`112`		`- return cmd._args`
	`111`	`+ return cmd.args`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`func (cmd *baseCmd) stringArg(pos int) string {`
`116`		`- if pos < 0 \|\| pos >= len(cmd._args) {`
	`115`	`+ if pos < 0 \|\| pos >= len(cmd.args) {`
`117`	`116`	`return ""`
`118`	`117`	`}`
`119`		`- s, _ := cmd._args[pos].(string)`
	`118`	`+ s, _ := cmd.args[pos].(string)`
`120`	`119`	`return s`
`121`	`120`	`}`
`122`	`121`
`@@ -146,7 +145,7 @@ type Cmd struct {`
`146`	`145`
`147`	`146`	`func NewCmd(args ...interface{}) *Cmd {`
`148`	`147`	`return &Cmd{`
`149`		`- baseCmd: baseCmd{_args: args},`
	`148`	`+ baseCmd: baseCmd{args: args},`
`150`	`149`	`}`
`151`	`150`	`}`
`152`	`151`
`@@ -303,7 +302,7 @@ var _ Cmder = (*SliceCmd)(nil)`
`303`	`302`
`304`	`303`	`func NewSliceCmd(args ...interface{}) *SliceCmd {`
`305`	`304`	`return &SliceCmd{`
`306`		`- baseCmd: baseCmd{_args: args},`
	`305`	`+ baseCmd: baseCmd{args: args},`
`307`	`306`	`}`
`308`	`307`	`}`
`309`	`308`
`@@ -341,7 +340,7 @@ var _ Cmder = (*StatusCmd)(nil)`
`341`	`340`
`342`	`341`	`func NewStatusCmd(args ...interface{}) *StatusCmd {`
`343`	`342`	`return &StatusCmd{`
`344`		`- baseCmd: baseCmd{_args: args},`
	`343`	`+ baseCmd: baseCmd{args: args},`
`345`	`344`	`}`
`346`	`345`	`}`
`347`	`346`
`@@ -374,7 +373,7 @@ var _ Cmder = (*IntCmd)(nil)`
`374`	`373`
`375`	`374`	`func NewIntCmd(args ...interface{}) *IntCmd {`
`376`	`375`	`return &IntCmd{`
`377`		`- baseCmd: baseCmd{_args: args},`
	`376`	`+ baseCmd: baseCmd{args: args},`
`378`	`377`	`}`
`379`	`378`	`}`
`380`	`379`
`@@ -407,7 +406,7 @@ var _ Cmder = (*IntSliceCmd)(nil)`
`407`	`406`
`408`	`407`	`func NewIntSliceCmd(args ...interface{}) *IntSliceCmd {`
`409`	`408`	`return &IntSliceCmd{`
`410`		`- baseCmd: baseCmd{_args: args},`
	`409`	`+ baseCmd: baseCmd{args: args},`
`411`	`410`	`}`
`412`	`411`	`}`
`413`	`412`
`@@ -451,7 +450,7 @@ var _ Cmder = (*DurationCmd)(nil)`
`451`	`450`
`452`	`451`	`func NewDurationCmd(precision time.Duration, args ...interface{}) *DurationCmd {`
`453`	`452`	`return &DurationCmd{`
`454`		`- baseCmd: baseCmd{_args: args},`
	`453`	`+ baseCmd: baseCmd{args: args},`
`455`	`454`	`precision: precision,`
`456`	`455`	`}`
`457`	`456`	`}`
`@@ -497,7 +496,7 @@ var _ Cmder = (*TimeCmd)(nil)`
`497`	`496`
`498`	`497`	`func NewTimeCmd(args ...interface{}) *TimeCmd {`
`499`	`498`	`return &TimeCmd{`
`500`		`- baseCmd: baseCmd{_args: args},`
	`499`	`+ baseCmd: baseCmd{args: args},`
`501`	`500`	`}`
`502`	`501`	`}`
`503`	`502`
`@@ -547,7 +546,7 @@ var _ Cmder = (*BoolCmd)(nil)`
`547`	`546`
`548`	`547`	`func NewBoolCmd(args ...interface{}) *BoolCmd {`
`549`	`548`	`return &BoolCmd{`
`550`		`- baseCmd: baseCmd{_args: args},`
	`549`	`+ baseCmd: baseCmd{args: args},`
`551`	`550`	`}`
`552`	`551`	`}`
`553`	`552`
`@@ -601,7 +600,7 @@ var _ Cmder = (*StringCmd)(nil)`
`601`	`600`
`602`	`601`	`func NewStringCmd(args ...interface{}) *StringCmd {`
`603`	`602`	`return &StringCmd{`
`604`		`- baseCmd: baseCmd{_args: args},`
	`603`	`+ baseCmd: baseCmd{args: args},`
`605`	`604`	`}`
`606`	`605`	`}`
`607`	`606`
`@@ -691,7 +690,7 @@ var _ Cmder = (*FloatCmd)(nil)`
`691`	`690`
`692`	`691`	`func NewFloatCmd(args ...interface{}) *FloatCmd {`
`693`	`692`	`return &FloatCmd{`
`694`		`- baseCmd: baseCmd{_args: args},`
	`693`	`+ baseCmd: baseCmd{args: args},`
`695`	`694`	`}`
`696`	`695`	`}`
`697`	`696`
`@@ -724,7 +723,7 @@ var _ Cmder = (*StringSliceCmd)(nil)`
`724`	`723`
`725`	`724`	`func NewStringSliceCmd(args ...interface{}) *StringSliceCmd {`
`726`	`725`	`return &StringSliceCmd{`
`727`		`- baseCmd: baseCmd{_args: args},`
	`726`	`+ baseCmd: baseCmd{args: args},`
`728`	`727`	`}`
`729`	`728`	`}`
`730`	`729`
`@@ -774,7 +773,7 @@ var _ Cmder = (*BoolSliceCmd)(nil)`
`774`	`773`
`775`	`774`	`func NewBoolSliceCmd(args ...interface{}) *BoolSliceCmd {`
`776`	`775`	`return &BoolSliceCmd{`
`777`		`- baseCmd: baseCmd{_args: args},`
	`776`	`+ baseCmd: baseCmd{args: args},`
`778`	`777`	`}`
`779`	`778`	`}`
`780`	`779`
`@@ -817,7 +816,7 @@ var _ Cmder = (*StringStringMapCmd)(nil)`
`817`	`816`
`818`	`817`	`func NewStringStringMapCmd(args ...interface{}) *StringStringMapCmd {`
`819`	`818`	`return &StringStringMapCmd{`
`820`		`- baseCmd: baseCmd{_args: args},`
	`819`	`+ baseCmd: baseCmd{args: args},`
`821`	`820`	`}`
`822`	`821`	`}`
`823`	`822`
`@@ -866,7 +865,7 @@ var _ Cmder = (*StringIntMapCmd)(nil)`
`866`	`865`
`867`	`866`	`func NewStringIntMapCmd(args ...interface{}) *StringIntMapCmd {`
`868`	`867`	`return &StringIntMapCmd{`
`869`		`- baseCmd: baseCmd{_args: args},`
	`868`	`+ baseCmd: baseCmd{args: args},`
`870`	`869`	`}`
`871`	`870`	`}`
`872`	`871`
`@@ -915,7 +914,7 @@ var _ Cmder = (*StringStructMapCmd)(nil)`
`915`	`914`
`916`	`915`	`func NewStringStructMapCmd(args ...interface{}) *StringStructMapCmd {`
`917`	`916`	`return &StringStructMapCmd{`
`918`		`- baseCmd: baseCmd{_args: args},`
	`917`	`+ baseCmd: baseCmd{args: args},`
`919`	`918`	`}`
`920`	`919`	`}`
`921`	`920`
`@@ -963,7 +962,7 @@ var _ Cmder = (*XMessageSliceCmd)(nil)`
`963`	`962`
`964`	`963`	`func NewXMessageSliceCmd(args ...interface{}) *XMessageSliceCmd {`
`965`	`964`	`return &XMessageSliceCmd{`
`966`		`- baseCmd: baseCmd{_args: args},`
	`965`	`+ baseCmd: baseCmd{args: args},`
`967`	`966`	`}`
`968`	`967`	`}`
`969`	`968`
`@@ -1054,7 +1053,7 @@ var _ Cmder = (*XStreamSliceCmd)(nil)`
`1054`	`1053`
`1055`	`1054`	`func NewXStreamSliceCmd(args ...interface{}) *XStreamSliceCmd {`
`1056`	`1055`	`return &XStreamSliceCmd{`
`1057`		`- baseCmd: baseCmd{_args: args},`
	`1056`	`+ baseCmd: baseCmd{args: args},`
`1058`	`1057`	`}`
`1059`	`1058`	`}`
`1060`	`1059`
`@@ -1123,7 +1122,7 @@ var _ Cmder = (*XPendingCmd)(nil)`
`1123`	`1122`
`1124`	`1123`	`func NewXPendingCmd(args ...interface{}) *XPendingCmd {`
`1125`	`1124`	`return &XPendingCmd{`
`1126`		`- baseCmd: baseCmd{_args: args},`
	`1125`	`+ baseCmd: baseCmd{args: args},`
`1127`	`1126`	`}`
`1128`	`1127`	`}`
`1129`	`1128`
`@@ -1222,7 +1221,7 @@ var _ Cmder = (*XPendingExtCmd)(nil)`
`1222`	`1221`
`1223`	`1222`	`func NewXPendingExtCmd(args ...interface{}) *XPendingExtCmd {`
`1224`	`1223`	`return &XPendingExtCmd{`
`1225`		`- baseCmd: baseCmd{_args: args},`
	`1224`	`+ baseCmd: baseCmd{args: args},`
`1226`	`1225`	`}`
`1227`	`1226`	`}`
`1228`	`1227`
`@@ -1296,7 +1295,7 @@ var _ Cmder = (*ZSliceCmd)(nil)`
`1296`	`1295`
`1297`	`1296`	`func NewZSliceCmd(args ...interface{}) *ZSliceCmd {`
`1298`	`1297`	`return &ZSliceCmd{`
`1299`		`- baseCmd: baseCmd{_args: args},`
	`1298`	`+ baseCmd: baseCmd{args: args},`
`1300`	`1299`	`}`
`1301`	`1300`	`}`
`1302`	`1301`
`@@ -1348,7 +1347,7 @@ var _ Cmder = (*ZWithKeyCmd)(nil)`
`1348`	`1347`
`1349`	`1348`	`func NewZWithKeyCmd(args ...interface{}) *ZWithKeyCmd {`
`1350`	`1349`	`return &ZWithKeyCmd{`
`1351`		`- baseCmd: baseCmd{_args: args},`
	`1350`	`+ baseCmd: baseCmd{args: args},`
`1352`	`1351`	`}`
`1353`	`1352`	`}`
`1354`	`1353`
`@@ -1408,7 +1407,7 @@ var _ Cmder = (*ScanCmd)(nil)`
`1408`	`1407`
`1409`	`1408`	`func NewScanCmd(process func(cmd Cmder) error, args ...interface{}) *ScanCmd {`
`1410`	`1409`	`return &ScanCmd{`
`1411`		`- baseCmd: baseCmd{_args: args},`
	`1410`	`+ baseCmd: baseCmd{args: args},`
`1412`	`1411`	`process: process,`
`1413`	`1412`	`}`
`1414`	`1413`	`}`
`@@ -1460,7 +1459,7 @@ var _ Cmder = (*ClusterSlotsCmd)(nil)`
`1460`	`1459`
`1461`	`1460`	`func NewClusterSlotsCmd(args ...interface{}) *ClusterSlotsCmd {`
`1462`	`1461`	`return &ClusterSlotsCmd{`
`1463`		`- baseCmd: baseCmd{_args: args},`
	`1462`	`+ baseCmd: baseCmd{args: args},`
`1464`	`1463`	`}`
`1465`	`1464`	`}`
`1466`	`1465`
`@@ -1577,7 +1576,7 @@ var _ Cmder = (*GeoLocationCmd)(nil)`
`1577`	`1576`
`1578`	`1577`	`func NewGeoLocationCmd(q GeoRadiusQuery, args ...interface{}) GeoLocationCmd {`
`1579`	`1578`	`return &GeoLocationCmd{`
`1580`		`- baseCmd: baseCmd{_args: geoLocationArgs(q, args...)},`
	`1579`	`+ baseCmd: baseCmd{args: geoLocationArgs(q, args...)},`
`1581`	`1580`	`q: q,`
`1582`	`1581`	`}`
`1583`	`1582`	`}`
`@@ -1721,7 +1720,7 @@ var _ Cmder = (*GeoPosCmd)(nil)`
`1721`	`1720`
`1722`	`1721`	`func NewGeoPosCmd(args ...interface{}) *GeoPosCmd {`
`1723`	`1722`	`return &GeoPosCmd{`
`1724`		`- baseCmd: baseCmd{_args: args},`
	`1723`	`+ baseCmd: baseCmd{args: args},`
`1725`	`1724`	`}`
`1726`	`1725`	`}`
`1727`	`1726`
`@@ -1795,7 +1794,7 @@ var _ Cmder = (*CommandsInfoCmd)(nil)`
`1795`	`1794`
`1796`	`1795`	`func NewCommandsInfoCmd(args ...interface{}) *CommandsInfoCmd {`
`1797`	`1796`	`return &CommandsInfoCmd{`
`1798`		`- baseCmd: baseCmd{_args: args},`
	`1797`	`+ baseCmd: baseCmd{args: args},`
`1799`	`1798`	`}`
`1800`	`1799`	`}`
`1801`	`1800`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ func (it *ScanIterator) Next() bool {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Fetch next page.`
`46`		`- if it.cmd._args[0] == "scan" {`
`47`		`- it.cmd._args[1] = it.cmd.cursor`
	`46`	`+ if it.cmd.args[0] == "scan" {`
	`47`	`+ it.cmd.args[1] = it.cmd.cursor`
`48`	`48`	`} else {`
`49`		`- it.cmd._args[2] = it.cmd.cursor`
	`49`	`+ it.cmd.args[2] = it.cmd.cursor`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`err := it.cmd.process(it.cmd)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (hs hooks) process(`
`46`	`46`
`47`	`47`	`cmdErr := fn(ctx, cmd)`
`48`	`48`
`49`		`- _, err = hs.afterProcess(ctx, cmd)`
	`49`	`+ err = hs.afterProcess(ctx, cmd)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return err`
`52`	`52`	`}`
`@@ -65,15 +65,15 @@ func (hs hooks) beforeProcess(ctx context.Context, cmd Cmder) (context.Context,`
`65`	`65`	`return ctx, nil`
`66`	`66`	`}`
`67`	`67`
`68`		`-func (hs hooks) afterProcess(ctx context.Context, cmd Cmder) (context.Context, error) {`
	`68`	`+func (hs hooks) afterProcess(ctx context.Context, cmd Cmder) error {`
`69`	`69`	`var firstErr error`
`70`	`70`	`for _, h := range hs.hooks {`
`71`	`71`	`err := h.AfterProcess(ctx, cmd)`
`72`	`72`	`if err != nil && firstErr == nil {`
`73`	`73`	`firstErr = err`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`- return ctx, firstErr`
	`76`	`+ return firstErr`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func (hs hooks) processPipeline(`
`@@ -86,7 +86,7 @@ func (hs hooks) processPipeline(`
`86`	`86`
`87`	`87`	`cmdsErr := fn(ctx, cmds)`
`88`	`88`
`89`		`- _, err = hs.afterProcessPipeline(ctx, cmds)`
	`89`	`+ err = hs.afterProcessPipeline(ctx, cmds)`
`90`	`90`	`if err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
`@@ -105,15 +105,15 @@ func (hs hooks) beforeProcessPipeline(ctx context.Context, cmds []Cmder) (contex`
`105`	`105`	`return ctx, nil`
`106`	`106`	`}`
`107`	`107`
`108`		`-func (hs hooks) afterProcessPipeline(ctx context.Context, cmds []Cmder) (context.Context, error) {`
	`108`	`+func (hs hooks) afterProcessPipeline(ctx context.Context, cmds []Cmder) error {`
`109`	`109`	`var firstErr error`
`110`	`110`	`for _, h := range hs.hooks {`
`111`	`111`	`err := h.AfterProcessPipeline(ctx, cmds)`
`112`	`112`	`if err != nil && firstErr == nil {`
`113`	`113`	`firstErr = err`
`114`	`114`	`}`
`115`	`115`	`}`
`116`		`- return ctx, firstErr`
	`116`	`+ return firstErr`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`//------------------------------------------------------------------------------`