Skip to content

Commit 995ef01

Browse files
committed
Remove "empty" and rename "duplicate" to "identical"
1 parent f0e87fa commit 995ef01

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

.golangci.next.reference.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -1227,9 +1227,14 @@ linters-settings:
12271227
# Default: []
12281228
enable:
12291229
- unused
1230-
- empty
1231-
- duplicate
1230+
- identical
12321231
- opaque
1232+
settings:
1233+
unused:
1234+
# Comma-separated list of packages to exclude from the check.
1235+
# Default: []
1236+
exclude:
1237+
- github.com/example/log
12331238

12341239
importas:
12351240
# Do not allow unaliased imports of aliased packages.

go.sum

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jsonschema/golangci.next.jsonschema.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,8 @@
295295
},
296296
"iface-analyzers": {
297297
"enum": [
298-
"empty",
299298
"unused",
300-
"duplicate",
299+
"identical",
301300
"opaque"
302301
]
303302
},

pkg/golinters/iface/iface.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ import (
55

66
"github.com/golangci/golangci-lint/pkg/config"
77
"github.com/golangci/golangci-lint/pkg/goanalysis"
8-
"github.com/uudashr/iface/duplicate"
9-
"github.com/uudashr/iface/empty"
8+
"github.com/uudashr/iface/identical"
109
"github.com/uudashr/iface/opaque"
1110
"github.com/uudashr/iface/unused"
1211
"golang.org/x/tools/go/analysis"
1312
)
1413

1514
var allAnalyzers = []*analysis.Analyzer{
1615
unused.Analyzer,
17-
empty.Analyzer,
18-
duplicate.Analyzer,
16+
identical.Analyzer,
1917
opaque.Analyzer,
2018
}
2119

pkg/golinters/iface/iface_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ func TestAnalyzersFromSettings(t *testing.T) {
1313
}{
1414
"nil analyzers": {
1515
enable: nil,
16-
expectedEnabled: []string{"unused", "empty", "duplicate", "opaque"},
16+
expectedEnabled: []string{"unused", "identical", "opaque"},
1717
},
1818
"empty analyzers": {
1919
enable: []string{},
20-
expectedEnabled: []string{"unused", "empty", "duplicate", "opaque"},
20+
expectedEnabled: []string{"unused", "identical", "opaque"},
2121
},
2222
"unused only": {
2323
enable: []string{"unused"},
@@ -32,8 +32,8 @@ func TestAnalyzersFromSettings(t *testing.T) {
3232
expectedEnabled: []string{"unused", "opaque"},
3333
},
3434
"all analyzers": {
35-
enable: []string{"unused", "opaque", "empty", "duplicate"},
36-
expectedEnabled: []string{"unused", "empty", "duplicate", "opaque"},
35+
enable: []string{"unused", "opaque", "identical"},
36+
expectedEnabled: []string{"unused", "identical", "opaque"},
3737
},
3838
}
3939

pkg/golinters/iface/testdata/duplicate.go

-11
This file was deleted.

pkg/golinters/iface/testdata/empty.go

-6
This file was deleted.

pkg/golinters/iface/testdata/empty.yml

-4
This file was deleted.
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//golangcitest:args -Eiface
2+
//golangcitest:config_path testdata/identical.yml
3+
package testdata
4+
5+
type Pinger interface { // want "interface Pinger contains identical methods or type constraints from another interface, causing redundancy"
6+
Ping() error
7+
}
8+
9+
type Healthcheck interface { // want "interface Healthcheck contains identical methods or type constraints from another interface, causing redundancy"
10+
Ping() error
11+
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
linters-settings:
22
iface:
33
enable:
4-
- duplicate
4+
- identical

0 commit comments

Comments
 (0)