Merge pull request redis#1718 from monkey92t/golangci

upgrade golangci-lint to v1.39.0
33kuai · Apr 8, 2021 · 8b2a710 · 8b2a710
2 parents 085647a + a2410be
commit 8b2a710
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -228,8 +228,7 @@ func (p *ConnPool) Get(ctx context.Context) (*Conn, error) {
 		return nil, ErrClosed
 	}
 
-	err := p.waitTurn(ctx)
-	if err != nil {
+	if err := p.waitTurn(ctx); err != nil {
 		return nil, err
 	}
 

diff --git a/pubsub.go b/pubsub.go
@@ -118,7 +118,7 @@ func mapKeys(m map[string]struct{}) []string {
 	i := 0
 	for k := range m {
 		s[i] = k
-		i++ // nolint:wastedassign
+		i++
 	}
 	return s
 }