Skip to content

Commit 7f17bbb

Browse files
committed
chore: groups nilnil files to a package
1 parent 13e4335 commit 7f17bbb

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

pkg/golinters/nilnil.go renamed to pkg/golinters/nilnil/nilnil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package nilnil
22

33
import (
44
"strings"
@@ -10,7 +10,7 @@ import (
1010
"github.com/golangci/golangci-lint/pkg/goanalysis"
1111
)
1212

13-
func NewNilNil(cfg *config.NilNilSettings) *goanalysis.Linter {
13+
func New(cfg *config.NilNilSettings) *goanalysis.Linter {
1414
a := analyzer.New()
1515

1616
cfgMap := make(map[string]map[string]any)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package nilnil
2+
3+
import (
4+
"testing"
5+
6+
"github.com/golangci/golangci-lint/test/testshared/integration"
7+
)
8+
9+
func TestFromTestdata(t *testing.T) {
10+
integration.RunTestdata(t)
11+
}
File renamed without changes.

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ import (
7171
"github.com/golangci/golangci-lint/pkg/golinters/nakedret"
7272
"github.com/golangci/golangci-lint/pkg/golinters/nestif"
7373
"github.com/golangci/golangci-lint/pkg/golinters/nilerr"
74+
"github.com/golangci/golangci-lint/pkg/golinters/nilnil"
7475
"github.com/golangci/golangci-lint/pkg/golinters/nolintlint"
7576
"github.com/golangci/golangci-lint/pkg/golinters/protogetter"
7677
"github.com/golangci/golangci-lint/pkg/golinters/spancheck"
@@ -540,7 +541,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
540541
WithPresets(linter.PresetBugs).
541542
WithURL("https://github.com/gostaticanalysis/nilerr"),
542543

543-
linter.NewConfig(golinters.NewNilNil(&cfg.LintersSettings.NilNil)).
544+
linter.NewConfig(nilnil.New(&cfg.LintersSettings.NilNil)).
544545
WithSince("v1.43.0").
545546
WithPresets(linter.PresetStyle).
546547
WithLoadForGoAnalysis().

0 commit comments

Comments
 (0)