Skip to content

Commit ecef625

Browse files
committed
dev: enable revive linter
Fixes revive issues: - useless-break: useless break in case clause - if-return: redundant if ...; err != nil check, just return error instead.
1 parent 6bc5d1c commit ecef625

File tree

4 files changed

+97
-9
lines changed

4 files changed

+97
-9
lines changed

.golangci.yml

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,99 @@ linters-settings:
6363
allow-unused: false # report any unused nolint directives
6464
require-explanation: false # don't require an explanation for nolint directives
6565
require-specific: false # don't require nolint directives to be specific about which linter is being skipped
66+
revive:
67+
rules:
68+
- name: atomic
69+
disabled: false
70+
- name: blank-imports
71+
disabled: false
72+
- name: bool-literal-in-expr
73+
disabled: false
74+
- name: call-to-gc
75+
disabled: false
76+
- name: confusing-results
77+
disabled: false
78+
- name: constant-logical-expr
79+
disabled: false
80+
- name: context-as-argument
81+
disabled: false
82+
- name: context-keys-type
83+
disabled: false
84+
- name: datarace
85+
disabled: false
86+
- name: defer
87+
disabled: false
88+
- name: dot-imports
89+
disabled: false
90+
- name: duplicated-imports
91+
disabled: false
92+
- name: early-return
93+
disabled: false
94+
- name: empty-block
95+
disabled: false
96+
- name: empty-lines
97+
disabled: false
98+
- name: error-naming
99+
disabled: false
100+
- name: error-return
101+
disabled: false
102+
- name: error-strings
103+
disabled: false
104+
- name: errorf
105+
disabled: false
106+
- name: exported
107+
disabled: false
108+
arguments:
109+
- "checkPrivateReceivers"
110+
- "sayRepetitiveInsteadOfStutters"
111+
- name: get-return
112+
disabled: false
113+
- name: identical-branches
114+
disabled: false
115+
- name: if-return
116+
disabled: false
117+
- name: increment-decrement
118+
disabled: false
119+
- name: indent-error-flow
120+
disabled: false
121+
- name: modifies-parameter
122+
disabled: false
123+
- name: modifies-value-receiver
124+
disabled: false
125+
- name: optimize-operands-order
126+
disabled: false
127+
- name: package-comments
128+
disabled: false
129+
- name: range
130+
disabled: false
131+
- name: range-val-in-closure
132+
disabled: false
133+
- name: range-val-address
134+
disabled: false
135+
- name: receiver-naming
136+
disabled: false
137+
- name: redefines-builtin-id
138+
disabled: false
139+
- name: string-of-int
140+
disabled: false
141+
- name: superfluous-else
142+
disabled: false
143+
- name: time-equal
144+
disabled: false
145+
- name: time-naming
146+
disabled: false
147+
- name: var-naming
148+
disabled: false
149+
- name: var-declaration
150+
disabled: false
151+
- name: unconditional-recursion
152+
disabled: false
153+
- name: unreachable-code
154+
disabled: false
155+
- name: useless-break
156+
disabled: false
157+
- name: waitgroup-by-value
158+
disabled: false
66159

67160
linters:
68161
disable-all: true
@@ -91,6 +184,7 @@ linters:
91184
- nakedret
92185
- noctx
93186
- nolintlint
187+
- revive
94188
- staticcheck
95189
- stylecheck
96190
- typecheck
@@ -112,7 +206,6 @@ linters:
112206
# - nestif
113207
# - prealloc
114208
# - testpackage
115-
# - revive
116209
# - wsl
117210

118211
issues:

pkg/golinters/lll.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ func getLLLIssuesForFile(filename string, maxLineLen int, tabSpaces string) ([]r
121121
}
122122

123123
if err := scanner.Err(); err != nil {
124+
//nolint:revive // early-return
124125
if err == bufio.ErrTooLong && maxLineLen < bufio.MaxScanTokenSize {
125126
// scanner.Scan() might fail if the line is longer than bufio.MaxScanTokenSize
126127
// In the case where the specified maxLineLen is smaller than bufio.MaxScanTokenSize

pkg/lint/lintersdb/enabled_set.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,9 @@ func (es EnabledSet) build(lcfg *config.Linters, enabledByDefaultLinters []*lint
3535
es.debugf("Linters config: %#v", lcfg)
3636
resultLintersSet := map[string]*linter.Config{}
3737
switch {
38-
case len(lcfg.Presets) != 0:
39-
break // imply --disable-all
38+
case lcfg.DisableAll, len(lcfg.Presets) != 0:
4039
case lcfg.EnableAll:
4140
resultLintersSet = linterConfigsToMap(es.m.GetAllSupportedLinterConfigs())
42-
case lcfg.DisableAll:
43-
break
4441
default:
4542
resultLintersSet = linterConfigsToMap(enabledByDefaultLinters)
4643
}

pkg/printers/junitxml.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,5 @@ func (p JunitXML) Print(ctx context.Context, issues []result.Issue) error {
8282

8383
enc := xml.NewEncoder(p.w)
8484
enc.Indent("", " ")
85-
if err := enc.Encode(res); err != nil {
86-
return err
87-
}
88-
return nil
85+
return enc.Encode(res)
8986
}

0 commit comments

Comments
 (0)