Skip to content

Commit 023e1c4

Browse files
build(deps): bump github.com/firefart/nonamedreturns from 1.0.2 to 1.0.4 (#2944)
Co-authored-by: Fernandez Ludovic <[email protected]>
1 parent 01f1a07 commit 023e1c4

File tree

9 files changed

+303
-245
lines changed

9 files changed

+303
-245
lines changed

.golangci.reference.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1159,9 +1159,9 @@ linters-settings:
11591159
require-specific: true
11601160

11611161
nonamedreturns:
1162-
# Do not complain about named error, if it is assigned inside defer.
1162+
# Report named error if it is assigned inside defer.
11631163
# Default: false
1164-
allow-error-in-defer: true
1164+
report-error-in-defer: true
11651165

11661166
paralleltest:
11671167
# Ignore missing calls to `t.Parallel()` and only report incorrect uses of it.

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/denis-tingaikin/go-header v0.4.3
2525
github.com/esimonov/ifshort v1.0.4
2626
github.com/fatih/color v1.13.0
27-
github.com/firefart/nonamedreturns v1.0.2
27+
github.com/firefart/nonamedreturns v1.0.4
2828
github.com/fzipp/gocyclo v0.6.0
2929
github.com/go-critic/go-critic v0.6.3
3030
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b
@@ -170,7 +170,7 @@ require (
170170
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
171171
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
172172
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
173-
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
173+
golang.org/x/sys v0.0.0-20220624220833-87e55d714810 // indirect
174174
golang.org/x/text v0.3.7 // indirect
175175
google.golang.org/protobuf v1.28.0 // indirect
176176
gopkg.in/ini.v1 v1.66.6 // indirect

go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/config/linters_settings.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ type NoLintLintSettings struct {
486486
}
487487

488488
type NoNamedReturnsSettings struct {
489-
AllowErrorInDefer bool `mapstructure:"allow-error-in-defer"`
489+
ReportErrorInDefer bool `mapstructure:"report-error-in-defer"`
490490
}
491491
type ParallelTestSettings struct {
492492
IgnoreMissing bool `mapstructure:"ignore-missing"`

pkg/golinters/nonamedreturns.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func NewNoNamedReturns(settings *config.NoNamedReturnsSettings) *goanalysis.Lint
1515
if settings != nil {
1616
cfg = map[string]map[string]interface{}{
1717
a.Name: {
18-
analyzer.FlagAllowErrorInDefer: settings.AllowErrorInDefer,
18+
analyzer.FlagReportErrorInDefer: settings.ReportErrorInDefer,
1919
},
2020
}
2121
}
@@ -25,5 +25,5 @@ func NewNoNamedReturns(settings *config.NoNamedReturnsSettings) *goanalysis.Lint
2525
a.Doc,
2626
[]*analysis.Analyzer{a},
2727
cfg,
28-
).WithLoadMode(goanalysis.LoadModeSyntax)
28+
).WithLoadMode(goanalysis.LoadModeTypesInfo)
2929
}

pkg/lint/lintersdb/manager.go

+1
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
627627

628628
linter.NewConfig(golinters.NewNoNamedReturns(noNamedReturnsCfg)).
629629
WithSince("v1.46.0").
630+
WithLoadForGoAnalysis().
630631
WithPresets(linter.PresetStyle).
631632
WithURL("https://github.com/firefart/nonamedreturns"),
632633

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
linters-settings:
22
nonamedreturns:
3-
allow-error-in-defer: true
3+
report-error-in-defer: true

0 commit comments

Comments
 (0)