From 7fa2a96ed3944c0b17f20ee0c74dc97cfa5e1fb7 Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Thu, 20 Jan 2022 11:53:01 +0100 Subject: [PATCH] grouper: coding style updates --- pkg/config/linters_settings.go | 7 +++---- pkg/golinters/grouper.go | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go index a27e3ebab246..a3744b8e0ae5 100644 --- a/pkg/config/linters_settings.go +++ b/pkg/config/linters_settings.go @@ -378,16 +378,15 @@ func (cfg GovetSettings) Validate() error { } type GrouperSettings struct { - // const analyzer options ConstRequireSingleConst bool `mapstructure:"const-require-single-const"` ConstRequireGrouping bool `mapstructure:"const-require-grouping"` - // import analyzer options + ImportRequireSingleImport bool `mapstructure:"import-require-single-import"` ImportRequireGrouping bool `mapstructure:"import-require-grouping"` - // type analyzer options + TypeRequireSingleType bool `mapstructure:"type-require-single-type"` TypeRequireGrouping bool `mapstructure:"type-require-grouping"` - // var analyzer options + VarRequireSingleVar bool `mapstructure:"var-require-single-var"` VarRequireGrouping bool `mapstructure:"var-require-grouping"` } diff --git a/pkg/golinters/grouper.go b/pkg/golinters/grouper.go index 87f5a6a627df..974efd43c89c 100644 --- a/pkg/golinters/grouper.go +++ b/pkg/golinters/grouper.go @@ -13,16 +13,15 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter { linterCfg := map[string]map[string]interface{}{} if settings != nil { linterCfg["grouper"] = map[string]interface{}{ - // const analyzer options "const-require-single-const": settings.ConstRequireSingleConst, "const-require-grouping": settings.ConstRequireGrouping, - // import analyzer options + "import-require-single-import": settings.ImportRequireSingleImport, "import-require-grouping": settings.ImportRequireGrouping, - // type analyzer options + "type-require-single-type": settings.TypeRequireSingleType, "type-require-grouping": settings.TypeRequireGrouping, - // var analyzer options + "var-require-single-var": settings.VarRequireSingleVar, "var-require-grouping": settings.VarRequireGrouping, }