Skip to content

Commit fa0cf1d

Browse files
committed
chore: groups ireturn files to a package
1 parent 0ca91ef commit fa0cf1d

File tree

10 files changed

+18
-6
lines changed

10 files changed

+18
-6
lines changed

pkg/golinters/ireturn.go renamed to pkg/golinters/ireturn/ireturn.go

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

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

13-
func NewIreturn(settings *config.IreturnSettings) *goanalysis.Linter {
13+
func New(settings *config.IreturnSettings) *goanalysis.Linter {
1414
a := analyzer.NewAnalyzer()
1515

1616
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 ireturn
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.

test/testdata/ireturn_allow.go renamed to pkg/golinters/ireturn/testdata/ireturn_allow.go

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

test/testdata/ireturn_reject_generics.go renamed to pkg/golinters/ireturn/testdata/ireturn_reject_generics.go

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

55
import (

test/testdata/ireturn_reject_stdlib.go renamed to pkg/golinters/ireturn/testdata/ireturn_reject_stdlib.go

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

55
import (

pkg/lint/lintersdb/builder_linter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import (
5959
"github.com/golangci/golangci-lint/pkg/golinters/ineffassign"
6060
"github.com/golangci/golangci-lint/pkg/golinters/interfacebloat"
6161
"github.com/golangci/golangci-lint/pkg/golinters/intrange"
62+
"github.com/golangci/golangci-lint/pkg/golinters/ireturn"
6263
"github.com/golangci/golangci-lint/pkg/golinters/loggercheck"
6364
"github.com/golangci/golangci-lint/pkg/golinters/mirror"
6465
"github.com/golangci/golangci-lint/pkg/golinters/misspell"
@@ -462,7 +463,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
462463
WithURL("https://github.com/ckaznocha/intrange").
463464
WithNoopFallback(cfg, linter.IsGoLowerThanGo122()),
464465

465-
linter.NewConfig(golinters.NewIreturn(&cfg.LintersSettings.Ireturn)).
466+
linter.NewConfig(ireturn.New(&cfg.LintersSettings.Ireturn)).
466467
WithSince("v1.43.0").
467468
WithPresets(linter.PresetStyle).
468469
WithLoadForGoAnalysis().

0 commit comments

Comments
 (0)