review

golangci · Nov 29, 2024 · ef6b153 · ef6b153
1 parent 493592e
commit ef6b153
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -114,6 +114,7 @@ linters:
     - unparam
     - unused
     - usestdlibvars
+    - usetesting
     - varnamelen
     - wastedassign
     - whitespace
@@ -230,6 +231,7 @@ linters:
     - unparam
     - unused
     - usestdlibvars
+    - usetesting
     - varnamelen
     - wastedassign
     - whitespace

diff --git a/pkg/golinters/usetesting/usetesting.go b/pkg/golinters/usetesting/usetesting.go
@@ -8,24 +8,24 @@ import (
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
 )
 
-func New(cfg *config.UseTestingSettings) *goanalysis.Linter {
+func New(settings *config.UseTestingSettings) *goanalysis.Linter {
 	a := usetesting.NewAnalyzer()
 
-	cfgMap := make(map[string]map[string]any)
-	if cfg != nil {
-		cfgMap[a.Name] = map[string]any{
-			"contextbackground": cfg.ContextBackground,
-			"contexttodo":       cfg.ContextTodo,
-			"oschdir":           cfg.OSChdir,
-			"osmkdirtemp":       cfg.OSMkdirTemp,
-			"ossetenv":          cfg.OSSetenv,
+	cfg := make(map[string]map[string]any)
+	if settings != nil {
+		cfg[a.Name] = map[string]any{
+			"contextbackground": settings.ContextBackground,
+			"contexttodo":       settings.ContextTodo,
+			"oschdir":           settings.OSChdir,
+			"osmkdirtemp":       settings.OSMkdirTemp,
+			"ossetenv":          settings.OSSetenv,
 		}
 	}
 
 	return goanalysis.NewLinter(
 		a.Name,
 		a.Doc,
 		[]*analysis.Analyzer{a},
-		cfgMap,
+		cfg,
 	).WithLoadMode(goanalysis.LoadModeTypesInfo)
 }