Skip to content

Commit 2daf1d6

Browse files
committed
chore: enable early-return and superfluous-else rules from revive
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent b6219ce commit 2daf1d6

File tree

5 files changed

+1095
-24
lines changed

5 files changed

+1095
-24
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ fmt:
2525
@!(gofmt -l -s -d ${GOFILES} | grep '[a-z]')
2626

2727
@echo "Verifying goimports, failures can be fixed with ./scripts/fix.sh"
28-
@!(go run golang.org/x/tools/cmd/goimports@latest -l -d ${GOFILES} | grep '[a-z]')
28+
@!(go tool goimports -l -d ${GOFILES} | grep '[a-z]')
2929

3030
.PHONY: verify
3131
verify:
32-
golangci-lint run --config tools/.golangci.yaml ./...
32+
go tool golangci-lint run --config tools/.golangci.yaml ./...
3333

3434
# Local development build
3535
build:

go.mod

+180-3
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,211 @@ require (
1818
)
1919

2020
require (
21+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
22+
4d63.com/gochecknoglobals v0.2.2 // indirect
23+
github.com/4meepo/tagalign v1.4.1 // indirect
24+
github.com/Abirdcfly/dupword v0.1.3 // indirect
25+
github.com/Antonboom/errname v1.0.0 // indirect
26+
github.com/Antonboom/nilnil v1.0.1 // indirect
27+
github.com/Antonboom/testifylint v1.5.2 // indirect
28+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
29+
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
30+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
31+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
32+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
33+
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
34+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
35+
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
36+
github.com/alexkohler/prealloc v1.0.0 // indirect
37+
github.com/alingse/asasalint v0.0.11 // indirect
38+
github.com/alingse/nilnesserr v0.1.2 // indirect
39+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
40+
github.com/ashanbrown/makezero v1.2.0 // indirect
41+
github.com/beorn7/perks v1.0.1 // indirect
42+
github.com/bkielbasa/cyclop v1.2.3 // indirect
43+
github.com/blizzy78/varnamelen v0.8.0 // indirect
44+
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
45+
github.com/breml/bidichk v0.3.2 // indirect
46+
github.com/breml/errchkjson v0.4.0 // indirect
47+
github.com/butuzov/ireturn v0.3.1 // indirect
48+
github.com/butuzov/mirror v1.3.0 // indirect
49+
github.com/catenacyber/perfsprint v0.8.1 // indirect
50+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
51+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
52+
github.com/charithe/durationcheck v0.0.10 // indirect
53+
github.com/chavacava/garif v0.1.0 // indirect
54+
github.com/ckaznocha/intrange v0.3.0 // indirect
2155
github.com/coreos/go-semver v0.3.1 // indirect
2256
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
57+
github.com/curioswitch/go-reassign v0.3.0 // indirect
58+
github.com/daixiang0/gci v0.13.5 // indirect
59+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
60+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
61+
github.com/ettle/strcase v0.2.0 // indirect
62+
github.com/fatih/color v1.18.0 // indirect
63+
github.com/fatih/structtag v1.2.0 // indirect
64+
github.com/firefart/nonamedreturns v1.0.5 // indirect
65+
github.com/fsnotify/fsnotify v1.5.4 // indirect
2366
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
67+
github.com/fzipp/gocyclo v0.6.0 // indirect
68+
github.com/ghostiam/protogetter v0.3.9 // indirect
69+
github.com/go-critic/go-critic v0.12.0 // indirect
2470
github.com/go-logr/logr v1.4.2 // indirect
71+
github.com/go-toolsmith/astcast v1.1.0 // indirect
72+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
73+
github.com/go-toolsmith/astequal v1.2.0 // indirect
74+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
75+
github.com/go-toolsmith/astp v1.1.0 // indirect
76+
github.com/go-toolsmith/strparse v1.1.0 // indirect
77+
github.com/go-toolsmith/typep v1.1.0 // indirect
78+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
79+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
80+
github.com/gobwas/glob v0.2.3 // indirect
81+
github.com/gofrs/flock v0.12.1 // indirect
2582
github.com/gogo/protobuf v1.3.2 // indirect
2683
github.com/golang/protobuf v1.5.4 // indirect
84+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
85+
github.com/golangci/go-printf-func-name v0.1.0 // indirect
86+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
87+
github.com/golangci/golangci-lint v1.64.5 // indirect
88+
github.com/golangci/misspell v0.6.0 // indirect
89+
github.com/golangci/plugin-module-register v0.1.1 // indirect
90+
github.com/golangci/revgrep v0.8.0 // indirect
91+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
92+
github.com/google/go-cmp v0.6.0 // indirect
2793
github.com/google/gofuzz v1.2.0 // indirect
94+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
95+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
96+
github.com/gostaticanalysis/comment v1.4.2 // indirect
97+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
98+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
99+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
100+
github.com/hashicorp/go-version v1.7.0 // indirect
101+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
102+
github.com/hashicorp/hcl v1.0.0 // indirect
103+
github.com/hexops/gotextdiff v1.0.3 // indirect
28104
github.com/inconshreveable/mousetrap v1.1.0 // indirect
105+
github.com/jgautheron/goconst v1.7.1 // indirect
106+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
107+
github.com/jjti/go-spancheck v0.6.4 // indirect
29108
github.com/json-iterator/go v1.1.12 // indirect
30-
github.com/kr/pretty v0.3.1 // indirect
109+
github.com/julz/importas v0.2.0 // indirect
110+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
111+
github.com/kisielk/errcheck v1.8.0 // indirect
112+
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
113+
github.com/kulti/thelper v0.6.3 // indirect
114+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
115+
github.com/lasiar/canonicalheader v1.1.2 // indirect
116+
github.com/ldez/exptostd v0.4.1 // indirect
117+
github.com/ldez/gomoddirectives v0.6.1 // indirect
118+
github.com/ldez/grignotin v0.9.0 // indirect
119+
github.com/ldez/tagliatelle v0.7.1 // indirect
120+
github.com/ldez/usetesting v0.4.2 // indirect
121+
github.com/leonklingele/grouper v1.1.2 // indirect
122+
github.com/macabu/inamedparam v0.1.3 // indirect
123+
github.com/magiconair/properties v1.8.6 // indirect
124+
github.com/maratori/testableexamples v1.0.0 // indirect
125+
github.com/maratori/testpackage v1.1.1 // indirect
126+
github.com/matoous/godox v1.1.0 // indirect
127+
github.com/mattn/go-colorable v0.1.14 // indirect
128+
github.com/mattn/go-isatty v0.0.20 // indirect
129+
github.com/mattn/go-runewidth v0.0.16 // indirect
130+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
131+
github.com/mgechev/revive v1.6.1 // indirect
132+
github.com/mitchellh/go-homedir v1.1.0 // indirect
133+
github.com/mitchellh/mapstructure v1.5.0 // indirect
31134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
32135
github.com/modern-go/reflect2 v1.0.2 // indirect
136+
github.com/moricho/tparallel v0.3.2 // indirect
137+
github.com/nakabonne/nestif v0.3.1 // indirect
138+
github.com/nishanths/exhaustive v0.12.0 // indirect
139+
github.com/nishanths/predeclared v0.2.2 // indirect
140+
github.com/nunnatsa/ginkgolinter v0.19.0 // indirect
141+
github.com/olekukonko/tablewriter v0.0.5 // indirect
142+
github.com/pelletier/go-toml v1.9.5 // indirect
143+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
144+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
145+
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
146+
github.com/prometheus/client_golang v1.12.1 // indirect
147+
github.com/prometheus/client_model v0.2.0 // indirect
148+
github.com/prometheus/common v0.32.1 // indirect
149+
github.com/prometheus/procfs v0.7.3 // indirect
150+
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
151+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
152+
github.com/quasilyte/gogrep v0.5.0 // indirect
153+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
154+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
155+
github.com/raeperd/recvcheck v0.2.0 // indirect
156+
github.com/rivo/uniseg v0.4.7 // indirect
157+
github.com/rogpeppe/go-internal v1.13.1 // indirect
158+
github.com/ryancurrah/gomodguard v1.3.5 // indirect
159+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
160+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
161+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
162+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
163+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
164+
github.com/securego/gosec/v2 v2.22.1 // indirect
165+
github.com/sirupsen/logrus v1.9.3 // indirect
166+
github.com/sivchari/containedctx v1.0.3 // indirect
167+
github.com/sivchari/tenv v1.12.1 // indirect
168+
github.com/sonatard/noctx v0.1.0 // indirect
169+
github.com/sourcegraph/go-diff v0.7.0 // indirect
170+
github.com/spf13/afero v1.12.0 // indirect
171+
github.com/spf13/cast v1.5.0 // indirect
172+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
33173
github.com/spf13/pflag v1.0.6 // indirect
174+
github.com/spf13/viper v1.12.0 // indirect
175+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
176+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
177+
github.com/stretchr/objx v0.5.2 // indirect
178+
github.com/stretchr/testify v1.10.0 // indirect
179+
github.com/subosito/gotenv v1.4.1 // indirect
180+
github.com/tdakkota/asciicheck v0.4.0 // indirect
181+
github.com/tetafro/godot v1.4.20 // indirect
182+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
183+
github.com/timonwong/loggercheck v0.10.1 // indirect
184+
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
185+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
186+
github.com/ultraware/funlen v0.2.0 // indirect
187+
github.com/ultraware/whitespace v0.2.0 // indirect
188+
github.com/uudashr/gocognit v1.2.0 // indirect
189+
github.com/uudashr/iface v1.3.1 // indirect
34190
github.com/x448/float16 v0.8.4 // indirect
191+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
192+
github.com/yagipy/maintidx v1.0.0 // indirect
193+
github.com/yeya24/promlinter v0.3.0 // indirect
194+
github.com/ykadowak/zerologlint v0.1.5 // indirect
195+
gitlab.com/bosi/decorder v0.4.2 // indirect
196+
go-simpler.org/musttag v0.13.0 // indirect
197+
go-simpler.org/sloglint v0.9.0 // indirect
198+
go.uber.org/automaxprocs v1.6.0 // indirect
35199
go.uber.org/multierr v1.11.0 // indirect
36200
go.uber.org/zap v1.27.0 // indirect
201+
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
202+
golang.org/x/mod v0.23.0 // indirect
37203
golang.org/x/net v0.35.0 // indirect
204+
golang.org/x/sync v0.11.0 // indirect
38205
golang.org/x/sys v0.30.0 // indirect
39206
golang.org/x/text v0.22.0 // indirect
40-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
41-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
207+
golang.org/x/tools v0.30.0 // indirect
208+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
209+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
42210
google.golang.org/grpc v1.70.0 // indirect
43211
google.golang.org/protobuf v1.36.5 // indirect
44212
gopkg.in/inf.v0 v0.9.1 // indirect
213+
gopkg.in/ini.v1 v1.67.0 // indirect
45214
gopkg.in/yaml.v3 v3.0.1 // indirect
215+
honnef.co/go/tools v0.6.0 // indirect
46216
k8s.io/klog/v2 v2.130.1 // indirect
47217
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
218+
mvdan.cc/gofumpt v0.7.0 // indirect
219+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
48220
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
49221
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
50222
sigs.k8s.io/yaml v1.4.0 // indirect
51223
)
224+
225+
tool (
226+
github.com/golangci/golangci-lint/cmd/golangci-lint
227+
golang.org/x/tools/cmd/goimports
228+
)

0 commit comments

Comments
 (0)