From 1dbb34e95b1e88ab98074ba0333c78ae73c6674a Mon Sep 17 00:00:00 2001 From: Roman Suvorov Date: Wed, 21 Oct 2020 19:26:02 +0300 Subject: [PATCH 1/3] enable gofumpt --- .golangci.yml | 2 +- ring.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 2132eee96..1e8d238c8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -17,5 +17,5 @@ linters: - gomnd - goerr113 - exhaustive - - gofumpt - nestif + - nlreturn diff --git a/ring.go b/ring.go index 205b0249d..34d05f35a 100644 --- a/ring.go +++ b/ring.go @@ -13,7 +13,6 @@ import ( "github.com/cespare/xxhash/v2" "github.com/dgryski/go-rendezvous" - "github.com/go-redis/redis/v8/internal" "github.com/go-redis/redis/v8/internal/hashtag" "github.com/go-redis/redis/v8/internal/pool" From a40e790abaadd6e2986f296ef1e213830a7c3350 Mon Sep 17 00:00:00 2001 From: Roman Suvorov Date: Wed, 21 Oct 2020 19:29:09 +0300 Subject: [PATCH 2/3] remove nlreturn --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 1e8d238c8..f8806dbab 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -18,4 +18,3 @@ linters: - goerr113 - exhaustive - nestif - - nlreturn From 171d5e5be901b9910fecaa1a02456db91a4045a4 Mon Sep 17 00:00:00 2001 From: Roman Suvorov Date: Wed, 21 Oct 2020 21:12:05 +0300 Subject: [PATCH 3/3] up golang-ci --- .golangci.yml | 1 + .travis.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index f8806dbab..1e8d238c8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -18,3 +18,4 @@ linters: - goerr113 - exhaustive - nestif + - nlreturn diff --git a/.travis.yml b/.travis.yml index adedd8df4..1bf578d4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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.28.3 + -b $(go env GOPATH)/bin v1.31.0