Skip to content

Commit

Permalink
Update golangci-lint to v1.32
Browse files Browse the repository at this point in the history
  • Loading branch information
johejo committed Nov 17, 2020
1 parent d4f01ed commit f5a1707
Showing 7 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -45,6 +45,6 @@ jobs:
fi
- name: Install golangci
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.32.2
- name: Test
run: make
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -19,3 +19,6 @@ linters:
- exhaustive
- nestif
- nlreturn
- exhaustivestruct
- wrapcheck
- errorlint
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -17,4 +17,4 @@ go_import_path: github.com/go-redis/redis

before_install:
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s --
-b $(go env GOPATH)/bin v1.31.0
-b $(go env GOPATH)/bin v1.32.2
2 changes: 1 addition & 1 deletion internal/proto/scan.go
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ func ScanSlice(data []string, slice interface{}) error {
for i, s := range data {
elem := next()
if err := Scan([]byte(s), elem.Addr().Interface()); err != nil {
err = fmt.Errorf("redis: ScanSlice index=%d value=%q failed: %s", i, s, err)
err = fmt.Errorf("redis: ScanSlice index=%d value=%q failed: %w", i, s, err)
return err
}
}
10 changes: 0 additions & 10 deletions internal/util.go
Original file line number Diff line number Diff line change
@@ -50,16 +50,6 @@ func isLower(s string) bool {
return true
}

func Unwrap(err error) error {
u, ok := err.(interface {
Unwrap() error
})
if !ok {
return nil
}
return u.Unwrap()
}

//------------------------------------------------------------------------------

func WithSpan(ctx context.Context, name string, fn func(context.Context, trace.Span) error) error {
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
@@ -271,7 +271,7 @@ func setupUnixConn(u *url.URL) (*Options, error) {

db, err := strconv.Atoi(dbStr)
if err != nil {
return nil, fmt.Errorf("redis: invalid database number: %s", err)
return nil, fmt.Errorf("redis: invalid database number: %w", err)
}
o.DB = db

3 changes: 2 additions & 1 deletion redis.go
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ package redis

import (
"context"
"errors"
"fmt"
"time"

@@ -230,7 +231,7 @@ func (c *baseClient) _getConn(ctx context.Context) (*pool.Conn, error) {
})
if err != nil {
c.connPool.Remove(ctx, cn, err)
if err := internal.Unwrap(err); err != nil {
if err := errors.Unwrap(err); err != nil {
return nil, err
}
return nil, err

0 comments on commit f5a1707

Please sign in to comment.