Skip to content

Commit 57b2ccb

Browse files
committed
chore: groups nonamedreturns files to a package
1 parent 4632246 commit 57b2ccb

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

pkg/golinters/nonamedreturns.go renamed to pkg/golinters/nonamedreturns/nonamedreturns.go

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

33
import (
44
"github.com/firefart/nonamedreturns/analyzer"
@@ -8,7 +8,7 @@ import (
88
"github.com/golangci/golangci-lint/pkg/goanalysis"
99
)
1010

11-
func NewNoNamedReturns(settings *config.NoNamedReturnsSettings) *goanalysis.Linter {
11+
func New(settings *config.NoNamedReturnsSettings) *goanalysis.Linter {
1212
a := analyzer.Analyzer
1313

1414
var cfg 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 nonamedreturns
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+
}

test/testdata/nonamedreturns_custom.go renamed to pkg/golinters/nonamedreturns/testdata/nonamedreturns_custom.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Enonamedreturns
2-
//golangcitest:config_path testdata/configs/nonamedreturns_custom.yml
2+
//golangcitest:config_path testdata/nonamedreturns_custom.yml
33
package testdata
44

55
import "fmt"

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import (
7575
"github.com/golangci/golangci-lint/pkg/golinters/nlreturn"
7676
"github.com/golangci/golangci-lint/pkg/golinters/noctx"
7777
"github.com/golangci/golangci-lint/pkg/golinters/nolintlint"
78+
"github.com/golangci/golangci-lint/pkg/golinters/nonamedreturns"
7879
"github.com/golangci/golangci-lint/pkg/golinters/protogetter"
7980
"github.com/golangci/golangci-lint/pkg/golinters/spancheck"
8081
"github.com/golangci/golangci-lint/pkg/golinters/tagalign"
@@ -560,7 +561,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
560561
WithPresets(linter.PresetPerformance, linter.PresetBugs).
561562
WithURL("https://github.com/sonatard/noctx"),
562563

563-
linter.NewConfig(golinters.NewNoNamedReturns(&cfg.LintersSettings.NoNamedReturns)).
564+
linter.NewConfig(nonamedreturns.New(&cfg.LintersSettings.NoNamedReturns)).
564565
WithSince("v1.46.0").
565566
WithLoadForGoAnalysis().
566567
WithPresets(linter.PresetStyle).

0 commit comments

Comments
 (0)