Skip to content

Commit e75ba05

Browse files
committed
chore: groups usestdlibvars files to a package
1 parent ff4417c commit e75ba05

File tree

6 files changed

+16
-4
lines changed

6 files changed

+16
-4
lines changed

test/testdata/usestdlibvars_non_default.go renamed to pkg/golinters/usestdlibvars/testdata/usestdlibvars_non_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:args -Eusestdlibvars
2-
//golangcitest:config_path testdata/configs/usestdlibvars_non_default.yml
2+
//golangcitest:config_path testdata/usestdlibvars_non_default.yml
33
package testdata
44

55
import "net/http"

pkg/golinters/usestdlibvars.go renamed to pkg/golinters/usestdlibvars/usestdlibvars.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package usestdlibvars
22

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

11-
func NewUseStdlibVars(cfg *config.UseStdlibVarsSettings) *goanalysis.Linter {
11+
func New(cfg *config.UseStdlibVarsSettings) *goanalysis.Linter {
1212
a := analyzer.New()
1313

1414
cfgMap := make(map[string]map[string]any)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package usestdlibvars
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+
}

pkg/lint/lintersdb/builder_linter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ import (
102102
"github.com/golangci/golangci-lint/pkg/golinters/unconvert"
103103
"github.com/golangci/golangci-lint/pkg/golinters/unparam"
104104
"github.com/golangci/golangci-lint/pkg/golinters/unused"
105+
"github.com/golangci/golangci-lint/pkg/golinters/usestdlibvars"
105106
"github.com/golangci/golangci-lint/pkg/golinters/whitespace"
106107
"github.com/golangci/golangci-lint/pkg/golinters/zerologlint"
107108
"github.com/golangci/golangci-lint/pkg/lint/linter"
@@ -773,7 +774,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
773774
WithChangeTypes().
774775
WithURL("https://github.com/dominikh/go-tools/tree/master/unused"),
775776

776-
linter.NewConfig(golinters.NewUseStdlibVars(&cfg.LintersSettings.UseStdlibVars)).
777+
linter.NewConfig(usestdlibvars.New(&cfg.LintersSettings.UseStdlibVars)).
777778
WithSince("v1.48.0").
778779
WithPresets(linter.PresetStyle).
779780
WithURL("https://github.com/sashamelentyev/usestdlibvars"),

0 commit comments

Comments
 (0)