Update golangci-lint rules

.golangci.yml

@@ -39,13 +39,11 @@ linters:
     - unparam # gopls is better and more subtle
     - varnamelen # Lots of false positives of things that are fine
     - wrapcheck # Not every error must be wrapped
-    - wsl # Very aggressive, some of this I like but tend to do anyway
-    - wsl_v5 # Very aggressive, some of this I like but tend to do anyway
+    - wsl # Deprecated
 
   exclusions:
     presets:
       # See https://golangci-lint.run/usage/false-positives/#exclusion-presets
-      - comments # Revive in particular has lots of false positives
       - std-error-handling
       - common-false-positives
     rules:
@@ -155,10 +153,7 @@ linters:
           disabled: true # predeclared does this
 
         - name: unhandled-error
-          arguments:
-            - fmt\.(Fp|P)rint(ln|f)?
-            - strings.Builder.Write(String|Byte)?
-            - bytes.Buffer.Write(String|Byte)?
+          disabled: true # errcheck handles this
 
         - name: flag-parameter
           disabled: true # As far as I can work out this just doesn't like bools

command.go

@@ -67,8 +67,8 @@ func New(name string, options ...Option) (*Command, error) {
 	errs = errors.Join(errs, err) // nil errors are discarded in join
 
 	err = Flag(&cfg.versionCalled, "version", 'V', false, "Show version info for "+name).apply(&cfg)
-	errs = errors.Join(errs, err)
 
+	errs = errors.Join(errs, err)
 	if errs != nil {
 		return nil, errs
 	}
@@ -472,7 +472,9 @@ func stripFlags(cmd *Command, args []string) []string {
 			if len(args) <= 1 {
 				return argsWithoutFlags
 			}
+
 			args = args[1:]
+
 			continue
 
 		case arg != "" && !strings.HasPrefix(arg, "-"):
@@ -669,6 +671,7 @@ func writeSubcommands(cmd *Command, s *strings.Builder) error {
 	} else {
 		s.WriteString("\n\n")
 	}
+
 	s.WriteString(colour.Title("Commands"))
 	s.WriteByte(':')
 	s.WriteByte('\n')

command_test.go

@@ -899,6 +899,7 @@ func TestCommandNoRunNoSub(t *testing.T) {
 
 func TestExecuteNilCommand(t *testing.T) {
 	var cmd *cli.Command
+
 	err := cmd.Execute()
 	test.Err(t, err)
 

internal/flag/flag.go

@@ -60,8 +60,7 @@ const (
 )
 
 const (
-	boolTrue  = "true"
-	boolFalse = "false"
+	boolTrue = "true"
 )
 
 // NoShortHand should be passed as the "short" argument to [New] if the desired flag
@@ -891,6 +890,7 @@ func formatStringSlice(slice []string) string {
 	length := len(slice)
 	s := &strings.Builder{}
 	s.WriteByte('[')
+
 	for index, elem := range slice {
 		s.WriteString(strconv.Quote(elem))
 		// Write commas and a space on every element other than the last one
@@ -899,6 +899,7 @@ func formatStringSlice(slice []string) string {
 			s.WriteByte(' ')
 		}
 	}
+
 	s.WriteByte(']')
 
 	return s.String()