Merge pull request #1718 from monkey92t/golangci

upgrade golangci-lint to v1.39.0
This commit is contained in:
Vladimir Mihailenco 2021-04-08 09:55:56 +03:00 committed by GitHub
commit 8b2a7107ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -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
}

View File

@ -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
}