Skip to content

Commit 57aec15

Browse files
committed
chore: enable unnecessary-stmt rule from revive
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 0f172d4 commit 57aec15

File tree

4 files changed

+12
-32
lines changed

4 files changed

+12
-32
lines changed

client/pkg/types/urls.go

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func NewURLs(strs []string) (URLs, error) {
4747
return nil, fmt.Errorf("URL must not contain a path: %s", in)
4848
}
4949
case "unix", "unixs":
50-
break
5150
default:
5251
return nil, fmt.Errorf("URL scheme must be http, https, unix, or unixs: %s", in)
5352
}

server/etcdmain/etcd.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ func startEtcdOrProxyV2(args []string) {
6464
lg.Info("Running: ", zap.Strings("args", args))
6565
if err != nil {
6666
lg.Warn("failed to verify flags", zap.Error(err))
67-
switch {
68-
case errorspkg.Is(err, embed.ErrUnsetAdvertiseClientURLsFlag):
67+
if errorspkg.Is(err, embed.ErrUnsetAdvertiseClientURLsFlag) {
6968
lg.Warn("advertise client URLs are not set", zap.Error(err))
7069
}
7170
os.Exit(1)

server/storage/wal/repair.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ func Repair(lg *zap.Logger, dirpath string) bool {
4949
switch {
5050
case err == nil:
5151
// update crc of the decoder when necessary
52-
switch rec.Type {
53-
case CrcType:
52+
if rec.Type == CrcType {
5453
crc := decoder.LastCRC()
5554
// current crc of decoder must match the crc of the record.
5655
// do no need to match 0 crc, since the decoder is a new one at this case.

tools/.golangci.yaml

+10-27
Original file line numberDiff line numberDiff line change
@@ -44,58 +44,41 @@ linters-settings: # please keep this alphabetized
4444
# Align with https://github.com/alexkohler/nakedret/blob/v1.0.2/cmd/nakedret/main.go#L10
4545
max-func-lines: 5
4646
revive:
47-
ignore-generated-header: false
48-
severity: error
4947
confidence: 0.8
50-
enable-all-rules: false
5148
rules:
5249
- name: blank-imports
53-
severity: error
5450
disabled: false
5551
- name: context-as-argument
56-
severity: error
52+
disabled: false
53+
- name: context-keys-type
5754
disabled: false
5855
- name: dot-imports
59-
severity: error
56+
disabled: false
57+
- name: error-naming
6058
disabled: false
6159
- name: error-return
62-
severity: error
6360
disabled: false
64-
- name: error-naming
65-
severity: error
61+
- name: error-strings
62+
disabled: false
63+
- name: errorf
6664
disabled: false
6765
- name: if-return
68-
severity: error
6966
disabled: false
7067
- name: increment-decrement
71-
severity: error
7268
disabled: false
73-
- name: var-declaration
74-
severity: error
69+
- name: indent-error-flow
7570
disabled: false
7671
- name: package-comments
77-
severity: error
7872
disabled: false
7973
- name: range
80-
severity: error
8174
disabled: false
8275
- name: receiver-naming
83-
severity: error
8476
disabled: false
8577
- name: time-naming
86-
severity: error
87-
disabled: false
88-
- name: indent-error-flow
89-
severity: error
90-
disabled: false
91-
- name: errorf
92-
severity: error
9378
disabled: false
94-
- name: context-keys-type
95-
severity: error
79+
- name: unnecessary-stmt
9680
disabled: false
97-
- name: error-strings
98-
severity: error
81+
- name: var-declaration
9982
disabled: false
10083
- name: var-naming
10184
disabled: false

0 commit comments

Comments
 (0)