From cf053b2624e4a973932183a0a33d2577ca175584 Mon Sep 17 00:00:00 2001
From: Oleg Butuzov <butuzov@users.noreply.github.com>
Date: Fri, 14 Jan 2022 15:30:15 +0200
Subject: [PATCH] exhaustive: drop deprecated/unused settings (#2482)
---
pkg/config/linters_settings.go | 5 +----
pkg/golinters/exhaustive.go | 3 ---
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
index 123ebc7f..d0106b3c 100644
--- a/pkg/config/linters_settings.go
+++ b/pkg/config/linters_settings.go
@@ -21,7 +21,7 @@ var defaultLintersSettings = LintersSettings{
CheckGenerated: false,
DefaultSignifiesExhaustive: false,
IgnoreEnumMembers: "",
- CheckingStrategy: "value",
+ PackageScopeOnly: false,
},
Forbidigo: ForbidigoSettings{
ExcludeGodocExamples: true,
@@ -223,9 +223,6 @@ type ExhaustiveSettings struct {
DefaultSignifiesExhaustive bool `mapstructure:"default-signifies-exhaustive"`
IgnoreEnumMembers string `mapstructure:"ignore-enum-members"`
PackageScopeOnly bool `mapstructure:"package-scope-only"`
-
- IgnorePattern string `mapstructure:"ignore-pattern"` // Deprecated: this setting has no effect; see IgnoreEnumMembers instead.
- CheckingStrategy string `mapstructure:"checking-strategy"` // Deprecated.
}
type ExhaustiveStructSettings struct {
diff --git a/pkg/golinters/exhaustive.go b/pkg/golinters/exhaustive.go
index 2fc36813..ea264687 100644
--- a/pkg/golinters/exhaustive.go
+++ b/pkg/golinters/exhaustive.go
@@ -19,9 +19,6 @@ func NewExhaustive(settings *config.ExhaustiveSettings) *goanalysis.Linter {
exhaustive.DefaultSignifiesExhaustiveFlag: settings.DefaultSignifiesExhaustive,
exhaustive.IgnoreEnumMembersFlag: settings.IgnoreEnumMembers,
exhaustive.PackageScopeOnlyFlag: settings.PackageScopeOnly,
-
- exhaustive.IgnorePatternFlag: settings.IgnorePattern,
- exhaustive.CheckingStrategyFlag: settings.CheckingStrategy,
},
}
}