Skip to content

Commit

Permalink
Merge pull request redis#883 from andriikushch/master
Browse files Browse the repository at this point in the history
fix some linter's warning
  • Loading branch information
vmihailenco authored Oct 11, 2018
2 parents 55f1f46 + 2d74cf3 commit 77f7b88
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ func startCluster(scenario *clusterScenario) error {
}

func assertSlotsEqual(slots, wanted []redis.ClusterSlot) error {
outer_loop:
outerLoop:
for _, s2 := range wanted {
for _, s1 := range slots {
if slotEqual(s1, s2) {
continue outer_loop
continue outerLoop
}
}
return fmt.Errorf("%v not found in %v", s2, slots)
Expand Down
2 changes: 1 addition & 1 deletion commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ var _ = Describe("Commands", func() {

sMembersMap := client.SMembersMap("set")
Expect(sMembersMap.Err()).NotTo(HaveOccurred())
Expect(sMembersMap.Val()).To(Equal(map[string]struct{}{"Hello": struct{}{}, "World": struct{}{}}))
Expect(sMembersMap.Val()).To(Equal(map[string]struct{}{"Hello": {}, "World": {}}))
})

It("should SMove", func() {
Expand Down
5 changes: 0 additions & 5 deletions internal/proto/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ package proto_test

import (
"bytes"
"strings"
"testing"

"github.com/go-redis/redis/internal/proto"
)

func newReader(s string) *proto.Reader {
return proto.NewReader(strings.NewReader(s))
}

func BenchmarkReader_ParseReply_Status(b *testing.B) {
benchmarkParseReply(b, "+OK\r\n", nil, false)
}
Expand Down
2 changes: 1 addition & 1 deletion redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ func txPipelineReadQueued(rd *proto.Reader, cmds []Cmder) error {
return err
}

for _ = range cmds {
for range cmds {
err = statusCmd.readReply(rd)
if err != nil && !internal.IsRedisError(err) {
return err
Expand Down

0 comments on commit 77f7b88

Please sign in to comment.