From 2d6cafadb15419e13d46275872728f6f25af805b Mon Sep 17 00:00:00 2001 From: Marcin Federowicz Date: Sun, 8 Dec 2024 01:06:49 +0100 Subject: [PATCH] after review changes --- lint/package.go | 12 ++---------- rule/add_constant.go | 6 ------ rule/banned_characters.go | 10 +++++----- rule/receiver_naming.go | 2 +- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/lint/package.go b/lint/package.go index 56bc5726f..9e8dee880 100644 --- a/lint/package.go +++ b/lint/package.go @@ -187,18 +187,10 @@ func (p *Package) lint(rules []Rule, config Config, failures chan Failure) error var eg errgroup.Group for _, file := range p.files { eg.Go(func() error { - err := file.lint(rules, config, failures) - if err != nil { - return err - } - return nil + return file.lint(rules, config, failures) }) } - if err := eg.Wait(); err != nil { - return err - } - - return nil + return eg.Wait() } // IsAtLeastGo121 returns true if the Go version for this package is 1.21 or higher, false otherwise diff --git a/rule/add_constant.go b/rule/add_constant.go index 2b737a7fd..f5ed2df56 100644 --- a/rule/add_constant.go +++ b/rule/add_constant.go @@ -272,9 +272,3 @@ func (r *AddConstantRule) configure(arguments lint.Arguments) error { return nil } - -func configOnce(r *AddConstantRule, arguments lint.Arguments) func() error { - return sync.OnceValue(func() error { - return r.configure(arguments) - }) -} diff --git a/rule/banned_characters.go b/rule/banned_characters.go index 1d8a67753..2c803e413 100644 --- a/rule/banned_characters.go +++ b/rule/banned_characters.go @@ -12,17 +12,17 @@ import ( // BannedCharsRule checks if a file contains banned characters. type BannedCharsRule struct { bannedCharList []string - - configureOnce sync.Once + + configureOnce sync.Once } const bannedCharsRuleName = "banned-characters" func (r *BannedCharsRule) configure(arguments lint.Arguments) error { if len(arguments) > 0 { - check := checkNumberOfArguments(1, arguments, bannedCharsRuleName) - if check != nil { - return check + err := checkNumberOfArguments(1, arguments, bannedCharsRuleName) + if err != nil { + return err } list, err := r.getBannedCharsList(arguments) if err != nil { diff --git a/rule/receiver_naming.go b/rule/receiver_naming.go index d4eba1f12..f9952c759 100644 --- a/rule/receiver_naming.go +++ b/rule/receiver_naming.go @@ -111,7 +111,7 @@ func (r *ReceiverNamingRule) Apply(file *lint.File, arguments lint.Arguments) ([ typeReceiver[recv] = name } - return failures + return failures, nil } // Name returns the rule name.