Skip to content

Commit 6b0798c

Browse files
committed
review
1 parent fbbfdef commit 6b0798c

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

pkg/config/linters_settings.go

+6-9
Original file line numberDiff line numberDiff line change
@@ -378,17 +378,14 @@ func (cfg GovetSettings) Validate() error {
378378
}
379379

380380
type GrouperSettings struct {
381-
ConstRequireSingleConst bool `mapstructure:"const-require-single-const"`
382-
ConstRequireGrouping bool `mapstructure:"const-require-grouping"`
383-
381+
ConstRequireSingleConst bool `mapstructure:"const-require-single-const"`
382+
ConstRequireGrouping bool `mapstructure:"const-require-grouping"`
384383
ImportRequireSingleImport bool `mapstructure:"import-require-single-import"`
385384
ImportRequireGrouping bool `mapstructure:"import-require-grouping"`
386-
387-
TypeRequireSingleType bool `mapstructure:"type-require-single-type"`
388-
TypeRequireGrouping bool `mapstructure:"type-require-grouping"`
389-
390-
VarRequireSingleVar bool `mapstructure:"var-require-single-var"`
391-
VarRequireGrouping bool `mapstructure:"var-require-grouping"`
385+
TypeRequireSingleType bool `mapstructure:"type-require-single-type"`
386+
TypeRequireGrouping bool `mapstructure:"type-require-grouping"`
387+
VarRequireSingleVar bool `mapstructure:"var-require-single-var"`
388+
VarRequireGrouping bool `mapstructure:"var-require-grouping"`
392389
}
393390

394391
type IfshortSettings struct {

pkg/golinters/grouper.go

+6-9
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter {
1212
linterCfg := map[string]map[string]interface{}{}
1313
if settings != nil {
1414
linterCfg["grouper"] = map[string]interface{}{
15-
"const-require-single-const": settings.ConstRequireSingleConst,
16-
"const-require-grouping": settings.ConstRequireGrouping,
17-
15+
"const-require-single-const": settings.ConstRequireSingleConst,
16+
"const-require-grouping": settings.ConstRequireGrouping,
1817
"import-require-single-import": settings.ImportRequireSingleImport,
1918
"import-require-grouping": settings.ImportRequireGrouping,
20-
21-
"type-require-single-type": settings.TypeRequireSingleType,
22-
"type-require-grouping": settings.TypeRequireGrouping,
23-
24-
"var-require-single-var": settings.VarRequireSingleVar,
25-
"var-require-grouping": settings.VarRequireGrouping,
19+
"type-require-single-type": settings.TypeRequireSingleType,
20+
"type-require-grouping": settings.TypeRequireGrouping,
21+
"var-require-single-var": settings.VarRequireSingleVar,
22+
"var-require-grouping": settings.VarRequireGrouping,
2623
}
2724
}
2825

0 commit comments

Comments
 (0)