Skip to content

Commit 47e23e5

Browse files
committed
newlinter: applying reviewer's comments
1 parent 1bf0125 commit 47e23e5

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

pkg/config/formatters_settings.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ type FormatterSettings struct {
1919
Gci GciSettings `mapstructure:"gci"`
2020
GoFmt GoFmtSettings `mapstructure:"gofmt"`
2121
GoFumpt GoFumptSettings `mapstructure:"gofumpt"`
22-
GoFuncOr GoFuncOrSettings `mapstructure:"gofuncor"`
2322
GoImports GoImportsSettings `mapstructure:"goimports"`
2423
GoLines GoLinesSettings `mapstructure:"golines"`
2524
}
@@ -49,8 +48,6 @@ type GoFumptSettings struct {
4948
LangVersion string `mapstructure:"-"`
5049
}
5150

52-
type GoFuncOrSettings struct{}
53-
5451
type GoImportsSettings struct {
5552
LocalPrefixes []string `mapstructure:"local-prefixes"`
5653
}

pkg/golinters/gofuncor/gofuncor.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package gofuncor
22

33
import (
4-
"github.com/golangci/golangci-lint/v2/pkg/config"
54
"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
65
"github.com/manuelarte/gofuncor/pkg/analyzer"
76
"golang.org/x/tools/go/analysis"
87
)
98

10-
func New(_ *config.GoFuncOrSettings) *goanalysis.Linter {
9+
func New() *goanalysis.Linter {
1110
a := analyzer.NewAnalyzer()
1211

1312
return goanalysis.NewLinter(

pkg/lint/lintersdb/builder_linter.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,8 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
336336
WithAutoFix().
337337
WithURL("https://github.com/mvdan/gofumpt"),
338338

339-
linter.NewConfig(gofuncor.New(&cfg.Linters.Settings.GoFuncOr)).
339+
linter.NewConfig(gofuncor.New()).
340340
WithSince("v2.1.0").
341-
WithAutoFix().
342341
WithURL("https://github.com/manuelarte/gofuncor"),
343342

344343
linter.NewConfig(golines.New(&cfg.Linters.Settings.GoLines)).

0 commit comments

Comments
 (0)