From 6b0798cf0232a5c875960833ad787654014b3fe0 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 25 Jan 2022 01:10:20 +0100 Subject: [PATCH] review --- pkg/config/linters_settings.go | 15 ++++++--------- pkg/golinters/grouper.go | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go index a3744b8e0ae5..7e97ad3c5575 100644 --- a/pkg/config/linters_settings.go +++ b/pkg/config/linters_settings.go @@ -378,17 +378,14 @@ func (cfg GovetSettings) Validate() error { } type GrouperSettings struct { - ConstRequireSingleConst bool `mapstructure:"const-require-single-const"` - ConstRequireGrouping bool `mapstructure:"const-require-grouping"` - + ConstRequireSingleConst bool `mapstructure:"const-require-single-const"` + ConstRequireGrouping bool `mapstructure:"const-require-grouping"` ImportRequireSingleImport bool `mapstructure:"import-require-single-import"` ImportRequireGrouping bool `mapstructure:"import-require-grouping"` - - TypeRequireSingleType bool `mapstructure:"type-require-single-type"` - TypeRequireGrouping bool `mapstructure:"type-require-grouping"` - - VarRequireSingleVar bool `mapstructure:"var-require-single-var"` - VarRequireGrouping bool `mapstructure:"var-require-grouping"` + TypeRequireSingleType bool `mapstructure:"type-require-single-type"` + TypeRequireGrouping bool `mapstructure:"type-require-grouping"` + VarRequireSingleVar bool `mapstructure:"var-require-single-var"` + VarRequireGrouping bool `mapstructure:"var-require-grouping"` } type IfshortSettings struct { diff --git a/pkg/golinters/grouper.go b/pkg/golinters/grouper.go index 8dff62735911..e8c1340e4b7e 100644 --- a/pkg/golinters/grouper.go +++ b/pkg/golinters/grouper.go @@ -12,17 +12,14 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter { linterCfg := map[string]map[string]interface{}{} if settings != nil { linterCfg["grouper"] = map[string]interface{}{ - "const-require-single-const": settings.ConstRequireSingleConst, - "const-require-grouping": settings.ConstRequireGrouping, - + "const-require-single-const": settings.ConstRequireSingleConst, + "const-require-grouping": settings.ConstRequireGrouping, "import-require-single-import": settings.ImportRequireSingleImport, "import-require-grouping": settings.ImportRequireGrouping, - - "type-require-single-type": settings.TypeRequireSingleType, - "type-require-grouping": settings.TypeRequireGrouping, - - "var-require-single-var": settings.VarRequireSingleVar, - "var-require-grouping": settings.VarRequireGrouping, + "type-require-single-type": settings.TypeRequireSingleType, + "type-require-grouping": settings.TypeRequireGrouping, + "var-require-single-var": settings.VarRequireSingleVar, + "var-require-grouping": settings.VarRequireGrouping, } }