exhaustive: drop deprecated/unused settings (#2482)

golangci · Jan 14, 2022 · cf053b2 · cf053b2
1 parent 9dacd61
commit cf053b2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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,
 			},
 		}
 	}