From 08bd398bfa71f3233136853ac8fde3e581719e9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:49:41 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/butuzov/ireturn from 0.2.2 to 0.3.0 Bumps [github.com/butuzov/ireturn](https://github.com/butuzov/ireturn) from 0.2.2 to 0.3.0. - [Release notes](https://github.com/butuzov/ireturn/releases) - [Changelog](https://github.com/butuzov/ireturn/blob/main/.goreleaser.yaml) - [Commits](https://github.com/butuzov/ireturn/compare/v0.2.2...v0.3.0) --- updated-dependencies: - dependency-name: github.com/butuzov/ireturn dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e4f948a041b3..f7e83244aadd 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/bombsimon/wsl/v4 v4.2.0 github.com/breml/bidichk v0.2.7 github.com/breml/errchkjson v0.3.6 - github.com/butuzov/ireturn v0.2.2 + github.com/butuzov/ireturn v0.3.0 github.com/butuzov/mirror v1.1.0 github.com/catenacyber/perfsprint v0.6.0 github.com/charithe/durationcheck v0.0.10 diff --git a/go.sum b/go.sum index b581b63248e2..3f3dd80947e9 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY= github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ= github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA= github.com/breml/errchkjson v0.3.6/go.mod h1:jhSDoFheAF2RSDOlCfhHO9KqhZgAYLyvHe7bRCX8f/U= -github.com/butuzov/ireturn v0.2.2 h1:jWI36dxXwVrI+RnXDwux2IZOewpmfv930OuIRfaBUJ0= -github.com/butuzov/ireturn v0.2.2/go.mod h1:RfGHUvvAuFFxoHKf4Z8Yxuh6OjlCw1KvR2zM1NFHeBk= +github.com/butuzov/ireturn v0.3.0 h1:hTjMqWw3y5JC3kpnC5vXmFJAWI/m31jaCYQqzkS6PL0= +github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD6edP5ZA= github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI= github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE= github.com/catenacyber/perfsprint v0.6.0 h1:VSv95RRkk5+BxrU/YTPcnxuMEWar1iMK5Vyh3fWcBfs= From 451ea4d1d1ea1b82c090486f4447f8bee4c95f53 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 7 Feb 2024 11:57:39 +0100 Subject: [PATCH 2/2] chore: update implementation --- pkg/golinters/ireturn.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/golinters/ireturn.go b/pkg/golinters/ireturn.go index 34dc09d2684d..dc09dad0eef3 100644 --- a/pkg/golinters/ireturn.go +++ b/pkg/golinters/ireturn.go @@ -16,8 +16,9 @@ func NewIreturn(settings *config.IreturnSettings) *goanalysis.Linter { cfg := map[string]map[string]any{} if settings != nil { cfg[a.Name] = map[string]any{ - "allow": strings.Join(settings.Allow, ","), - "reject": strings.Join(settings.Reject, ","), + "allow": strings.Join(settings.Allow, ","), + "reject": strings.Join(settings.Reject, ","), + "nonolint": true, } }