Skip to content

Commit b406ebd

Browse files
committed
Fix: use new version wastedassign
1 parent 0110a1b commit b406ebd

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f
5555
github.com/ryancurrah/gomodguard v1.2.0
5656
github.com/ryanrolds/sqlclosecheck v0.3.0
57-
github.com/sanposhiho/wastedassign v0.1.1
57+
github.com/sanposhiho/wastedassign v0.1.2
5858
github.com/securego/gosec/v2 v2.5.0
5959
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c
6060
github.com/shirou/gopsutil/v3 v3.21.1

go.sum

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/lint/lintersdb/manager.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,20 +367,17 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
367367
linter.NewConfig(golinters.NewPredeclared(predeclaredCfg)).
368368
WithPresets(linter.PresetStyle).
369369
WithURL("https://github.com/nishanths/predeclared"),
370-
<<<<<<< HEAD
371370
linter.NewConfig(golinters.NewRevive(reviveCfg)).
372371
WithPresets(linter.PresetStyle).
373372
WithURL("https://github.com/mgechev/revive"),
374373
linter.NewConfig(golinters.NewDurationCheck()).
375374
WithPresets(linter.PresetBugs).
376375
WithLoadForGoAnalysis().
377376
WithURL("https://github.com/charithe/durationcheck"),
378-
=======
379377
linter.NewConfig(golinters.NewWastedAssign()).
380378
WithLoadForGoAnalysis().
381379
WithPresets(linter.PresetStyle).
382380
WithURL("https://github.com/sanposhiho/wastedassign"),
383-
>>>>>>> efdda8eb... Add linter wastedassign
384381

385382
// nolintlint must be last because it looks at the results of all the previous linters for unused nolint directives
386383
linter.NewConfig(golinters.NewNoLintLint()).

0 commit comments

Comments
 (0)