build(deps): bump github.com/Antonboom/nilnil from 0.1.9 to 1.0.0

.golangci.next.reference.yml

@@ -2115,14 +2115,17 @@ linters-settings:
  min-complexity: 4
 
  nilnil:
+ # In addition, detect opposite situation (simultaneous return of non-nil error and valid value).
+ # Default: false
+ detect-opposite: true
  # List of return types to check.
- # Default: ["ptr", "func", "iface", "map", "chan", "uintptr", "unsafeptr"]
+ # Default: ["chan", "func", "iface", "map", "ptr", "uintptr", "unsafeptr"]
  checked-types:
- - ptr
+ - chan
  - func
  - iface
  - map
- - chan
+ - ptr
  - uintptr
  - unsafeptr
 

go.mod

@@ -8,7 +8,7 @@ require (
  github.com/4meepo/tagalign v1.3.4
  github.com/Abirdcfly/dupword v0.1.1
  github.com/Antonboom/errname v1.0.0
- github.com/Antonboom/nilnil v0.1.9
+ github.com/Antonboom/nilnil v1.0.0
  github.com/Antonboom/testifylint v1.5.0
  github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c
  github.com/Crocmagnon/fatcontext v0.5.2

jsonschema/golangci.next.jsonschema.json

@@ -2188,13 +2188,18 @@
  "type": "object",
  "additionalProperties": false,
  "properties": {
+ "detect-opposite": {
+ "type": "boolean",
+ "description": "In addition, detect opposite situation (simultaneous return of non-nil error and valid value).",
+ "default": false
+ },
  "checked-types": {
  "type": "array",
  "description": "List of return types to check.",
  "items": {
- "enum": ["ptr", "func", "iface", "map", "chan", "uintptr", "unsafeptr"]
+ "enum": ["chan", "func", "iface", "map", "ptr", "uintptr", "unsafeptr"]
  },
- "default": ["ptr", "func", "iface", "map", "chan", "uintptr", "unsafeptr"]
+ "default": ["chan", "func", "iface", "map", "ptr", "uintptr", "unsafeptr"]
  }
  }
  },

pkg/config/linters_settings.go

@@ -733,7 +733,8 @@ type NestifSettings struct {
 }
 
 type NilNilSettings struct {
- CheckedTypes []string `mapstructure:"checked-types"`
+ DetectOpposite bool `mapstructure:"detect-opposite"`
+ CheckedTypes []string `mapstructure:"checked-types"`
 }
 
 type NlreturnSettings struct {

pkg/golinters/nilnil/nilnil.go

@@ -1,22 +1,23 @@
 package nilnil
 
 import (
- "strings"
-
  "github.com/Antonboom/nilnil/pkg/analyzer"
  "golang.org/x/tools/go/analysis"
 
  "github.com/golangci/golangci-lint/pkg/config"
  "github.com/golangci/golangci-lint/pkg/goanalysis"
 )
 
-func New(cfg *config.NilNilSettings) *goanalysis.Linter {
+func New(settings *config.NilNilSettings) *goanalysis.Linter {
  a := analyzer.New()
 
  cfgMap := make(map[string]map[string]any)
- if cfg != nil && len(cfg.CheckedTypes) != 0 {
+ if settings != nil {
  cfgMap[a.Name] = map[string]any{
- "checked-types": strings.Join(cfg.CheckedTypes, ","),
+ "detect-opposite": settings.DetectOpposite,
+ }
+ if len(settings.CheckedTypes) != 0 {
+ cfgMap[a.Name]["checked-types"] = settings.CheckedTypes
  }
  }