build(deps): bump github.com/nishanths/exhaustive from 0.3.6 to 0.6.0 (…

…#2353) Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>
golangci · Nov 9, 2021 · ecbb9c4 · ecbb9c4
1 parent 8bc9562
commit ecbb9c4
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 57 deletions.
diff --git a/.golangci.example.yml b/.golangci.example.yml
@@ -154,10 +154,8 @@ linters-settings:
     # enum members matching the supplied regex do not have to be listed in
     # switch statements to satisfy exhaustiveness
     ignore-enum-members: ""
-    # strategy to use when checking exhaustiveness of switch statements; one of:
-    # "name", "value"; see documentation for details:
-    # https://pkg.go.dev/github.com/nishanths/exhaustive#section-documentation
-    checking-strategy: "value"
+    # consider enums only in package scopes, not in inner scopes
+    package-scope-only: false
 
   exhaustivestruct:
     # Struct Patterns is list of expressions to match struct packages and names

diff --git a/go.mod b/go.mod
@@ -59,7 +59,7 @@ require (
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/moricho/tparallel v0.2.1
 	github.com/nakabonne/nestif v0.3.1
-	github.com/nishanths/exhaustive v0.3.6
+	github.com/nishanths/exhaustive v0.6.0
 	github.com/nishanths/predeclared v0.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349

diff --git a/go.sum b/go.sum
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -199,9 +199,11 @@ type ErrorLintSettings struct {
 type ExhaustiveSettings struct {
 	CheckGenerated             bool   `mapstructure:"check-generated"`
 	DefaultSignifiesExhaustive bool   `mapstructure:"default-signifies-exhaustive"`
-	IgnorePattern              string `mapstructure:"ignore-pattern"` // Deprecated: this setting has no effect; see IgnoreEnumMembers instead.
 	IgnoreEnumMembers          string `mapstructure:"ignore-enum-members"`
-	CheckingStrategy           string `mapstructure:"checking-strategy"`
+	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
@@ -17,9 +17,11 @@ func NewExhaustive(settings *config.ExhaustiveSettings) *goanalysis.Linter {
 			a.Name: {
 				exhaustive.CheckGeneratedFlag:             settings.CheckGenerated,
 				exhaustive.DefaultSignifiesExhaustiveFlag: settings.DefaultSignifiesExhaustive,
-				exhaustive.IgnorePatternFlag:              settings.IgnorePattern,
 				exhaustive.IgnoreEnumMembersFlag:          settings.IgnoreEnumMembers,
-				exhaustive.CheckingStrategyFlag:           settings.CheckingStrategy,
+				exhaustive.PackageScopeOnly:               settings.PackageScopeOnly,
+
+				exhaustive.IgnorePatternFlag:    settings.IgnorePattern,
+				exhaustive.CheckingStrategyFlag: settings.CheckingStrategy,
 			},
 		}
 	}

diff --git a/test/testdata/configs/exhaustive_checking_strategy_name.yml b/test/testdata/configs/exhaustive_checking_strategy_name.yml
diff --git a/test/testdata/configs/exhaustive_checking_strategy_value.yml b/test/testdata/configs/exhaustive_checking_strategy_value.yml
diff --git a/test/testdata/exhaustive_checking_strategy_name.go b/test/testdata/exhaustive_checking_strategy_name.go
diff --git a/test/testdata/exhaustive_checking_strategy_value.go b/test/testdata/exhaustive_checking_strategy_value.go