From da89bf2c4d3e24a63287342d9b0ef094a3fc0a88 Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Tue, 29 Mar 2022 11:04:44 +0200 Subject: [PATCH 01/18] Add namedreturnlint --- go.mod | 3 ++- go.sum | 4 ++++ pkg/golinters/namedreturnlint.go | 18 ++++++++++++++++++ pkg/lint/lintersdb/manager.go | 5 +++++ test/testdata/namedreturnlint.go | 22 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkg/golinters/namedreturnlint.go create mode 100644 test/testdata/namedreturnlint.go diff --git a/go.mod b/go.mod index ce43755923b7..87e33dd3c983 100644 --- a/go.mod +++ b/go.mod @@ -157,7 +157,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect @@ -169,6 +169,7 @@ require ( require github.com/hashicorp/go-version v1.4.0 require ( + github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb // indirect github.com/hexops/gotextdiff v1.0.3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect ) diff --git a/go.sum b/go.sum index 7bd7dc6f393e..61de02fb47f6 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb h1:y7okFI6LvAIFIjgg5TJGV09KKNecaN2NsDhg/uh0Gnk= +github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -1015,6 +1017,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= +golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/golinters/namedreturnlint.go b/pkg/golinters/namedreturnlint.go new file mode 100644 index 000000000000..c9c166751e6a --- /dev/null +++ b/pkg/golinters/namedreturnlint.go @@ -0,0 +1,18 @@ +package golinters + +import ( + "github.com/firefart/namedreturnlint/analyzer" + + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" + + "golang.org/x/tools/go/analysis" +) + +func NewNamedReturnLint() *goanalysis.Linter { + return goanalysis.NewLinter( + "namedreturnlint", + "Checks for named returns", + []*analysis.Analyzer{analyzer.Analyzer}, + nil, + ).WithLoadMode(goanalysis.LoadModeSyntax) +} diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index b64ba23e4ed7..fdd15a793bac 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -487,6 +487,11 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithAutoFix(). WithURL("https://github.com/client9/misspell"), + linter.NewConfig(golinters.NewNamedReturnLint()). + WithSince("v1.45.3"). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/FireFart/namedreturnlint"), + linter.NewConfig(golinters.NewNakedret()). WithSince("v1.19.0"). WithPresets(linter.PresetStyle). diff --git a/test/testdata/namedreturnlint.go b/test/testdata/namedreturnlint.go new file mode 100644 index 000000000000..15cc14d63856 --- /dev/null +++ b/test/testdata/namedreturnlint.go @@ -0,0 +1,22 @@ +//args: -Enamedreturnlint +package testdata + +type asdf struct { + test string +} + +func noParams() { + return +} + +func argl(i string, a, b int) (ret1 string, ret2 interface{}, ret3, ret4 int, ret5 asdf) { // ERROR `named return ret1 \(string\) found in function argl` + return "", nil, 1, 2, asdf{} +} + +func good(i string) string { + return i +} + +func myLog(format string, args ...interface{}) { + return +} From 2c69f3357f5ac6d8d6c48cf520425a72dae7b904 Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Tue, 29 Mar 2022 11:13:19 +0200 Subject: [PATCH 02/18] use newer version --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 87e33dd3c983..7ddb9375a0dc 100644 --- a/go.mod +++ b/go.mod @@ -169,7 +169,7 @@ require ( require github.com/hashicorp/go-version v1.4.0 require ( - github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb // indirect + github.com/firefart/namedreturnlint v0.0.0-20220329091228-7012af2b64be // indirect github.com/hexops/gotextdiff v1.0.3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect ) diff --git a/go.sum b/go.sum index 61de02fb47f6..c8bb36fc87f7 100644 --- a/go.sum +++ b/go.sum @@ -174,6 +174,8 @@ github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb h1:y7okFI6LvAIFIjgg5TJGV09KKNecaN2NsDhg/uh0Gnk= github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= +github.com/firefart/namedreturnlint v0.0.0-20220329091228-7012af2b64be h1:xcRFDkwR2Rjr/xazeLqg5fkl0pFGfO8kAn0B3dBoaUA= +github.com/firefart/namedreturnlint v0.0.0-20220329091228-7012af2b64be/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= From c24bb804925c71e65972fcc822b4bdaf53f30bcc Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Tue, 29 Mar 2022 11:18:22 +0200 Subject: [PATCH 03/18] update yml files --- .golangci.example.yml | 1 + .golangci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.golangci.example.yml b/.golangci.example.yml index 72d5c7acd68f..31cf39bbad44 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -829,6 +829,7 @@ linters-settings: - ifaceassert - loopclosure - lostcancel + - namedreturnlint - nilfunc - nilness - printf diff --git a/.golangci.yml b/.golangci.yml index 4427980c5835..b3f0aaf06aa0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -108,6 +108,7 @@ linters: # - goerr113 # - interfacer # - maligned + # - namedreturnlint # - nestif # - prealloc # - testpackage From dd3bf0dd114f9ccec8cc8eaf2e43d6da8f23b703 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 00:38:18 +0200 Subject: [PATCH 04/18] remove golang-ci.yml entry --- .golangci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b3f0aaf06aa0..12606d02b319 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -108,7 +108,6 @@ linters: # - goerr113 # - interfacer # - maligned - # - namedreturnlint # - nestif # - prealloc # - testpackage @@ -131,7 +130,7 @@ issues: run: timeout: 5m - go: '1.17' # TODO(ldez): we force to use an old version of Go for the CI and the tests. + go: "1.17" # TODO(ldez): we force to use an old version of Go for the CI and the tests. skip-dirs: - test/testdata_etc - internal/cache From 9f546ec3e1ebfeac0060671b5711d5974378822d Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 00:42:02 +0200 Subject: [PATCH 05/18] add linter --- go.mod | 3 ++- go.sum | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 00c792cefbf1..0570177576db 100644 --- a/go.mod +++ b/go.mod @@ -23,6 +23,7 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 github.com/esimonov/ifshort v1.0.4 github.com/fatih/color v1.13.0 + github.com/firefart/namedreturnlint v1.0.0 github.com/fzipp/gocyclo v0.5.0 github.com/go-critic/go-critic v0.6.2 github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b @@ -161,7 +162,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index 54fbfa9ccd1c..a33b8477a907 100644 --- a/go.sum +++ b/go.sum @@ -172,10 +172,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb h1:y7okFI6LvAIFIjgg5TJGV09KKNecaN2NsDhg/uh0Gnk= -github.com/firefart/namedreturnlint v0.0.0-20220329082522-77714df50eeb/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= -github.com/firefart/namedreturnlint v0.0.0-20220329091228-7012af2b64be h1:xcRFDkwR2Rjr/xazeLqg5fkl0pFGfO8kAn0B3dBoaUA= -github.com/firefart/namedreturnlint v0.0.0-20220329091228-7012af2b64be/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= +github.com/firefart/namedreturnlint v1.0.0 h1:tqdySjoqveqzJZG8OJ5tihFNq5v0n9db+tGkIjtUVtc= +github.com/firefart/namedreturnlint v1.0.0/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -1019,8 +1017,6 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= From f4c5c48e00daf106298b758eb5ca6f0b07daed65 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 00:46:39 +0200 Subject: [PATCH 06/18] reorder --- pkg/lint/lintersdb/manager.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 7def705d7db4..c66379f4bd4d 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -492,16 +492,16 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithAutoFix(). WithURL("https://github.com/client9/misspell"), - linter.NewConfig(golinters.NewNamedReturnLint()). - WithSince("v1.45.3"). - WithPresets(linter.PresetStyle). - WithURL("https://github.com/FireFart/namedreturnlint"), - linter.NewConfig(golinters.NewNakedret()). WithSince("v1.19.0"). WithPresets(linter.PresetStyle). WithURL("https://github.com/alexkohler/nakedret"), + linter.NewConfig(golinters.NewNamedReturnLint()). + WithSince("v1.45.3"). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/FireFart/namedreturnlint"), + linter.NewConfig(golinters.NewNestif()). WithSince("v1.25.0"). WithPresets(linter.PresetComplexity). From 51917ed7d9f9480e47a0167be109115943501dfc Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 01:02:19 +0200 Subject: [PATCH 07/18] change to minor --- pkg/lint/lintersdb/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index c66379f4bd4d..15d50216e96b 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -498,7 +498,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithURL("https://github.com/alexkohler/nakedret"), linter.NewConfig(golinters.NewNamedReturnLint()). - WithSince("v1.45.3"). + WithSince("v1.46.0"). WithPresets(linter.PresetStyle). WithURL("https://github.com/FireFart/namedreturnlint"), From 61262b2815576a8a96af15956462d6a2345e0f68 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 01:08:25 +0200 Subject: [PATCH 08/18] add import inside test --- test/testdata/namedreturnlint.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/testdata/namedreturnlint.go b/test/testdata/namedreturnlint.go index 15cc14d63856..6a33da307c4f 100644 --- a/test/testdata/namedreturnlint.go +++ b/test/testdata/namedreturnlint.go @@ -1,6 +1,8 @@ //args: -Enamedreturnlint package testdata +import "fmt" + type asdf struct { test string } @@ -10,7 +12,8 @@ func noParams() { } func argl(i string, a, b int) (ret1 string, ret2 interface{}, ret3, ret4 int, ret5 asdf) { // ERROR `named return ret1 \(string\) found in function argl` - return "", nil, 1, 2, asdf{} + x := "dummy" + return fmt.Sprintf("%s", x), nil, 1, 2, asdf{} } func good(i string) string { From 00694819ba8e3ce019eb04a5f8ede7e353b7ae68 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 01:09:57 +0200 Subject: [PATCH 09/18] revert vscode autostyle --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 12606d02b319..4427980c5835 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -130,7 +130,7 @@ issues: run: timeout: 5m - go: "1.17" # TODO(ldez): we force to use an old version of Go for the CI and the tests. + go: '1.17' # TODO(ldez): we force to use an old version of Go for the CI and the tests. skip-dirs: - test/testdata_etc - internal/cache From 5140293a2a1b46e086a736fa48657b477d32699c Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 01:12:22 +0200 Subject: [PATCH 10/18] also add to enable --- .golangci.example.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.golangci.example.yml b/.golangci.example.yml index 6029eebbfea6..f145077cf97b 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -788,6 +788,7 @@ linters-settings: - ifaceassert - loopclosure - lostcancel + - namedreturnlint - nilfunc - nilness - printf From bda76183c18f5b83a1c9139982b54925bfd0b309 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 1 Apr 2022 01:31:16 +0200 Subject: [PATCH 11/18] reorder imports --- pkg/golinters/namedreturnlint.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/golinters/namedreturnlint.go b/pkg/golinters/namedreturnlint.go index c9c166751e6a..e472a21decac 100644 --- a/pkg/golinters/namedreturnlint.go +++ b/pkg/golinters/namedreturnlint.go @@ -2,10 +2,9 @@ package golinters import ( "github.com/firefart/namedreturnlint/analyzer" + "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - - "golang.org/x/tools/go/analysis" ) func NewNamedReturnLint() *goanalysis.Linter { From e3504c344c04ccefcbaf3cabcd7e9b1f67ef4484 Mon Sep 17 00:00:00 2001 From: firefart Date: Sat, 2 Apr 2022 22:31:33 +0200 Subject: [PATCH 12/18] rename linter --- .golangci.example.yml | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- .../{namedreturnlint.go => nonamedreturnlint.go} | 8 ++++---- pkg/lint/lintersdb/manager.go | 10 +++++----- .../{namedreturnlint.go => nonamedreturnlint.go} | 0 6 files changed, 17 insertions(+), 17 deletions(-) rename pkg/golinters/{namedreturnlint.go => nonamedreturnlint.go} (62%) rename test/testdata/{namedreturnlint.go => nonamedreturnlint.go} (100%) diff --git a/.golangci.example.yml b/.golangci.example.yml index f145077cf97b..69baf6686782 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -788,9 +788,9 @@ linters-settings: - ifaceassert - loopclosure - lostcancel - - namedreturnlint - nilfunc - nilness + - nonamedreturnlint - printf - reflectvaluecompare - shadow @@ -832,9 +832,9 @@ linters-settings: - ifaceassert - loopclosure - lostcancel - - namedreturnlint - nilfunc - nilness + - nonamedreturnlint - printf - reflectvaluecompare - shadow diff --git a/go.mod b/go.mod index 0570177576db..f9312ff80977 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 github.com/esimonov/ifshort v1.0.4 github.com/fatih/color v1.13.0 - github.com/firefart/namedreturnlint v1.0.0 + github.com/firefart/nonamedreturnlint v1.0.0 github.com/fzipp/gocyclo v0.5.0 github.com/go-critic/go-critic v0.6.2 github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b @@ -162,7 +162,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect + golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index a33b8477a907..edf24b96c5b6 100644 --- a/go.sum +++ b/go.sum @@ -172,8 +172,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/firefart/namedreturnlint v1.0.0 h1:tqdySjoqveqzJZG8OJ5tihFNq5v0n9db+tGkIjtUVtc= -github.com/firefart/namedreturnlint v1.0.0/go.mod h1:UNH48Uxt05YAdVnuSwoHj4JR6JqbYnOGFUIdrKUgkxk= +github.com/firefart/nonamedreturnlint v1.0.0 h1:ZBQyQavtD+kUN0cRZtkWJyfDW3HVEOTX2MYagwpROKY= +github.com/firefart/nonamedreturnlint v1.0.0/go.mod h1:l9OzrxTb0IoZmCUi/fwdJOSncv1Neyb+EgrSHSatWtI= github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -1017,8 +1017,8 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY= +golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/golinters/namedreturnlint.go b/pkg/golinters/nonamedreturnlint.go similarity index 62% rename from pkg/golinters/namedreturnlint.go rename to pkg/golinters/nonamedreturnlint.go index e472a21decac..55926983aba1 100644 --- a/pkg/golinters/namedreturnlint.go +++ b/pkg/golinters/nonamedreturnlint.go @@ -1,16 +1,16 @@ package golinters import ( - "github.com/firefart/namedreturnlint/analyzer" + "github.com/firefart/nonamedreturnlint/analyzer" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" ) -func NewNamedReturnLint() *goanalysis.Linter { +func NewNoNamedReturnLint() *goanalysis.Linter { return goanalysis.NewLinter( - "namedreturnlint", - "Checks for named returns", + "nonamedreturnlint", + "Reports all named returns", []*analysis.Analyzer{analyzer.Analyzer}, nil, ).WithLoadMode(goanalysis.LoadModeSyntax) diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 15d50216e96b..830cd41174e8 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -497,11 +497,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithPresets(linter.PresetStyle). WithURL("https://github.com/alexkohler/nakedret"), - linter.NewConfig(golinters.NewNamedReturnLint()). - WithSince("v1.46.0"). - WithPresets(linter.PresetStyle). - WithURL("https://github.com/FireFart/namedreturnlint"), - linter.NewConfig(golinters.NewNestif()). WithSince("v1.25.0"). WithPresets(linter.PresetComplexity). @@ -532,6 +527,11 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithURL("https://github.com/sonatard/noctx"). WithNoopFallback(m.cfg), + linter.NewConfig(golinters.NewNoNamedReturnLint()). + WithSince("v1.46.0"). + WithPresets(linter.PresetStyle). + WithURL("https://github.com/FireFart/nonamedreturnlint"), + linter.NewConfig(golinters.NewParallelTest()). WithSince("v1.33.0"). WithPresets(linter.PresetStyle, linter.PresetTest). diff --git a/test/testdata/namedreturnlint.go b/test/testdata/nonamedreturnlint.go similarity index 100% rename from test/testdata/namedreturnlint.go rename to test/testdata/nonamedreturnlint.go From 7814ad9f49eeefe134cf0d9b082d27c02a99e66a Mon Sep 17 00:00:00 2001 From: firefart Date: Sat, 2 Apr 2022 22:39:43 +0200 Subject: [PATCH 13/18] forgot one item in the rename --- test/testdata/nonamedreturnlint.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testdata/nonamedreturnlint.go b/test/testdata/nonamedreturnlint.go index 6a33da307c4f..0a9bec0821f5 100644 --- a/test/testdata/nonamedreturnlint.go +++ b/test/testdata/nonamedreturnlint.go @@ -1,4 +1,4 @@ -//args: -Enamedreturnlint +//args: -Enonamedreturnlint package testdata import "fmt" From 1edb1cad510f78a6057b7decd35425b3a9eeaeb5 Mon Sep 17 00:00:00 2001 From: firefart Date: Sun, 3 Apr 2022 13:51:30 +0200 Subject: [PATCH 14/18] add more testcases --- .golangci.example.yml | 4 +- go.mod | 4 +- go.sum | 8 +- ...nonamedreturnlint.go => nonamedreturns.go} | 6 +- pkg/lint/lintersdb/manager.go | 4 +- test/testdata/nonamedreturnlint.go | 25 ----- test/testdata/nonamedreturns.go | 94 +++++++++++++++++++ 7 files changed, 107 insertions(+), 38 deletions(-) rename pkg/golinters/{nonamedreturnlint.go => nonamedreturns.go} (69%) delete mode 100644 test/testdata/nonamedreturnlint.go create mode 100644 test/testdata/nonamedreturns.go diff --git a/.golangci.example.yml b/.golangci.example.yml index 69baf6686782..f2f97c92d877 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -790,7 +790,7 @@ linters-settings: - lostcancel - nilfunc - nilness - - nonamedreturnlint + - nonamedreturns - printf - reflectvaluecompare - shadow @@ -834,7 +834,7 @@ linters-settings: - lostcancel - nilfunc - nilness - - nonamedreturnlint + - nonamedreturns - printf - reflectvaluecompare - shadow diff --git a/go.mod b/go.mod index f9312ff80977..d102ad7ddb03 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 github.com/esimonov/ifshort v1.0.4 github.com/fatih/color v1.13.0 - github.com/firefart/nonamedreturnlint v1.0.0 + github.com/firefart/nonamedreturns v1.0.0 github.com/fzipp/gocyclo v0.5.0 github.com/go-critic/go-critic v0.6.2 github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b @@ -162,7 +162,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect + golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index edf24b96c5b6..0103b437abac 100644 --- a/go.sum +++ b/go.sum @@ -172,8 +172,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/firefart/nonamedreturnlint v1.0.0 h1:ZBQyQavtD+kUN0cRZtkWJyfDW3HVEOTX2MYagwpROKY= -github.com/firefart/nonamedreturnlint v1.0.0/go.mod h1:l9OzrxTb0IoZmCUi/fwdJOSncv1Neyb+EgrSHSatWtI= +github.com/firefart/nonamedreturns v1.0.0 h1:TKZUsLIQ7rks6+g5qdG+MAtMIvZEvVSYGNDeybB7jO0= +github.com/firefart/nonamedreturns v1.0.0/go.mod h1:D3dpIBojGGNh5UfElmwPu73SwDCm+VKhHYqwlNOk2uQ= github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -1017,8 +1017,8 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY= -golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 h1:PgUUmg0gNMIPY2WafhL/oLyQGw+kdTNPlVWOjltpp3w= +golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/golinters/nonamedreturnlint.go b/pkg/golinters/nonamedreturns.go similarity index 69% rename from pkg/golinters/nonamedreturnlint.go rename to pkg/golinters/nonamedreturns.go index 55926983aba1..8c943d83eeb9 100644 --- a/pkg/golinters/nonamedreturnlint.go +++ b/pkg/golinters/nonamedreturns.go @@ -1,15 +1,15 @@ package golinters import ( - "github.com/firefart/nonamedreturnlint/analyzer" + "github.com/firefart/nonamedreturns/analyzer" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" ) -func NewNoNamedReturnLint() *goanalysis.Linter { +func NewNoNamedReturns() *goanalysis.Linter { return goanalysis.NewLinter( - "nonamedreturnlint", + "nonamedreturns", "Reports all named returns", []*analysis.Analyzer{analyzer.Analyzer}, nil, diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 830cd41174e8..1fa9b499fef6 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -527,10 +527,10 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithURL("https://github.com/sonatard/noctx"). WithNoopFallback(m.cfg), - linter.NewConfig(golinters.NewNoNamedReturnLint()). + linter.NewConfig(golinters.NewNoNamedReturns()). WithSince("v1.46.0"). WithPresets(linter.PresetStyle). - WithURL("https://github.com/FireFart/nonamedreturnlint"), + WithURL("https://github.com/firefart/nonamedreturns"), linter.NewConfig(golinters.NewParallelTest()). WithSince("v1.33.0"). diff --git a/test/testdata/nonamedreturnlint.go b/test/testdata/nonamedreturnlint.go deleted file mode 100644 index 0a9bec0821f5..000000000000 --- a/test/testdata/nonamedreturnlint.go +++ /dev/null @@ -1,25 +0,0 @@ -//args: -Enonamedreturnlint -package testdata - -import "fmt" - -type asdf struct { - test string -} - -func noParams() { - return -} - -func argl(i string, a, b int) (ret1 string, ret2 interface{}, ret3, ret4 int, ret5 asdf) { // ERROR `named return ret1 \(string\) found in function argl` - x := "dummy" - return fmt.Sprintf("%s", x), nil, 1, 2, asdf{} -} - -func good(i string) string { - return i -} - -func myLog(format string, args ...interface{}) { - return -} diff --git a/test/testdata/nonamedreturns.go b/test/testdata/nonamedreturns.go new file mode 100644 index 000000000000..5850281db892 --- /dev/null +++ b/test/testdata/nonamedreturns.go @@ -0,0 +1,94 @@ +//args: -Enonamedreturns +package testdata + +import "fmt" + +type asdf struct { + test string +} + +func noParams() { + return +} + +var c = func() { + return +} + +var d = func() error { + return nil +} + +var e = func() (err error) { // ERROR `named return "err" with type "error" found` + err = nil + return +} + +var ( + f = func() { + return + } + + g = func() error { + return nil + } + + h = func() (err error) { // ERROR `named return "err" with type "error" found` + err = nil + return + } +) + +// this should not match as the implementation does not need named parameters (see below) +type funcDefintion func(arg1, arg2 interface{}) (num int, err error) + +func funcDefintionImpl(arg1, arg2 interface{}) (int, error) { + return 0, nil +} + +func funcDefintionImpl2(arg1, arg2 interface{}) (num int, err error) { // ERROR `named return "num" with type "int" found` + return 0, nil +} + +var funcVar = func() (msg string) { // ERROR `named return "msg" with type "string" found` + msg = "c" + return msg +} + +func test() { + a := funcVar() + _ = a + + var function funcDefintion + function = funcDefintionImpl + i, err := function("", "") + _ = i + _ = err + function = funcDefintionImpl2 + i, err = function("", "") + _ = i + _ = err +} + +func good(i string) string { + return i +} + +func bad(i string, a, b int) (ret1 string, ret2 interface{}, ret3, ret4 int, ret5 asdf) { // ERROR `named return "ret1" with type "string" found` + x := "dummy" + return fmt.Sprintf("%s", x), nil, 1, 2, asdf{} +} + +func bad2() (msg string, err error) { // ERROR `named return "msg" with type "string" found` + msg = "" + err = nil + return +} + +func myLog(format string, args ...interface{}) { + return +} + +type obj struct{} + +func (o *obj) func1() (err error) { return nil } // ERROR `named return "err" with type "error" found` From ec8435ded4049b2e9bd1ad9e48f896502f8c69c4 Mon Sep 17 00:00:00 2001 From: firefart Date: Fri, 8 Apr 2022 23:41:07 +0200 Subject: [PATCH 15/18] update --- go.mod | 6 +++--- go.sum | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6d88639dbc44..05aaecfaf442 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/yagipy/maintidx v1.0.0 github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 gitlab.com/bosi/decorder v0.2.1 - golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a + golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b honnef.co/go/tools v0.3.0 mvdan.cc/gofumpt v0.3.1 @@ -161,9 +161,9 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 // indirect + golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index 4e6c32d2b6d4..7ce1ef633601 100644 --- a/go.sum +++ b/go.sum @@ -859,6 +859,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b h1:1MSqJBxq66rbEP29+EBWKhTAoif7TI9xPRDjX+M0c8g= +golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1017,8 +1019,11 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 h1:PgUUmg0gNMIPY2WafhL/oLyQGw+kdTNPlVWOjltpp3w= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw= +golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1136,6 +1141,8 @@ golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II= golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd h1:uULq7gNDcV7Qld+mIfrzVw0HwoffgboxjpakmkackB0= +golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From ed1cd212e267ffd792f0aabe6e810d553a58a153 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sat, 9 Apr 2022 01:25:41 +0200 Subject: [PATCH 16/18] Revert "update" This reverts commit ec8435ded4049b2e9bd1ad9e48f896502f8c69c4. --- go.mod | 6 +++--- go.sum | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 05aaecfaf442..6d88639dbc44 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/yagipy/maintidx v1.0.0 github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 gitlab.com/bosi/decorder v0.2.1 - golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd + golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b honnef.co/go/tools v0.3.0 mvdan.cc/gofumpt v0.3.1 @@ -161,9 +161,9 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect - golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b // indirect + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect + golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index 7ce1ef633601..4e6c32d2b6d4 100644 --- a/go.sum +++ b/go.sum @@ -859,8 +859,6 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b h1:1MSqJBxq66rbEP29+EBWKhTAoif7TI9xPRDjX+M0c8g= -golang.org/x/mod v0.6.0-dev.0.20220330205332-605edab4323b/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1019,11 +1017,8 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 h1:PgUUmg0gNMIPY2WafhL/oLyQGw+kdTNPlVWOjltpp3w= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1141,8 +1136,6 @@ golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II= golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd h1:uULq7gNDcV7Qld+mIfrzVw0HwoffgboxjpakmkackB0= -golang.org/x/tools v0.1.11-0.20220408144541-fe932b4680bd/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From d33fddb22da653259c536af18319e08cced66b6e Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sat, 9 Apr 2022 01:28:41 +0200 Subject: [PATCH 17/18] review: fix go.sum --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index 4e6c32d2b6d4..171238e3bba4 100644 --- a/go.sum +++ b/go.sum @@ -1016,7 +1016,7 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0 h1:PgUUmg0gNMIPY2WafhL/oLyQGw+kdTNPlVWOjltpp3w= golang.org/x/sys v0.0.0-20220403020550-483a9cbc67c0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= From 0c720264f627f8a952cf80ae68c0684b806f027c Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 17 Apr 2022 15:26:27 +0200 Subject: [PATCH 18/18] chore: invalidate the cache --- pkg/golinters/godot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/golinters/godot.go b/pkg/golinters/godot.go index cd5b2a43ef02..09eb9b5b2e9f 100644 --- a/pkg/golinters/godot.go +++ b/pkg/golinters/godot.go @@ -37,7 +37,7 @@ func NewGodot() *goanalysis.Linter { // Convert deprecated setting // todo(butuzov): remove on v2 release - if cfg.CheckAll { // nolint:staticcheck + if cfg.CheckAll { // nolint:staticcheck // Keep for retro-compatibility. settings.Scope = godot.AllScope }