Skip to content

Commit 29e52e5

Browse files
butuzovSeigeC
authored andcommitted
exhaustive: drop deprecated/unused settings (golangci#2482)
1 parent c0364d4 commit 29e52e5

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

pkg/config/linters_settings.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var defaultLintersSettings = LintersSettings{
2121
CheckGenerated: false,
2222
DefaultSignifiesExhaustive: false,
2323
IgnoreEnumMembers: "",
24-
CheckingStrategy: "value",
24+
PackageScopeOnly: false,
2525
},
2626
Forbidigo: ForbidigoSettings{
2727
ExcludeGodocExamples: true,
@@ -223,9 +223,6 @@ type ExhaustiveSettings struct {
223223
DefaultSignifiesExhaustive bool `mapstructure:"default-signifies-exhaustive"`
224224
IgnoreEnumMembers string `mapstructure:"ignore-enum-members"`
225225
PackageScopeOnly bool `mapstructure:"package-scope-only"`
226-
227-
IgnorePattern string `mapstructure:"ignore-pattern"` // Deprecated: this setting has no effect; see IgnoreEnumMembers instead.
228-
CheckingStrategy string `mapstructure:"checking-strategy"` // Deprecated.
229226
}
230227

231228
type ExhaustiveStructSettings struct {

pkg/golinters/exhaustive.go

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ func NewExhaustive(settings *config.ExhaustiveSettings) *goanalysis.Linter {
1919
exhaustive.DefaultSignifiesExhaustiveFlag: settings.DefaultSignifiesExhaustive,
2020
exhaustive.IgnoreEnumMembersFlag: settings.IgnoreEnumMembers,
2121
exhaustive.PackageScopeOnlyFlag: settings.PackageScopeOnly,
22-
23-
exhaustive.IgnorePatternFlag: settings.IgnorePattern,
24-
exhaustive.CheckingStrategyFlag: settings.CheckingStrategy,
2522
},
2623
}
2724
}

0 commit comments

Comments
 (0)