From cb50375e2b6abf0c79d4891e5e1ea775b9759cd2 Mon Sep 17 00:00:00 2001 From: Wim Date: Mon, 20 Jun 2022 12:02:49 +0200 Subject: Add more linters to improve code readability (#19989) Add nakedret, unconvert, wastedassign, stylecheck and nolintlint linters to improve code readability - nakedret - https://github.com/alexkohler/nakedret - nakedret is a Go static analysis tool to find naked returns in functions greater than a specified function length. - unconvert - https://github.com/mdempsky/unconvert - Remove unnecessary type conversions - wastedassign - https://github.com/sanposhiho/wastedassign - wastedassign finds wasted assignment statements. - notlintlint - Reports ill-formed or insufficient nolint directives - stylecheck - https://staticcheck.io/docs/checks/#ST - keep style consistent - excluded: [ST1003 - Poorly chosen identifier](https://staticcheck.io/docs/checks/#ST1003) and [ST1005 - Incorrectly formatted error string](https://staticcheck.io/docs/checks/#ST1005) --- modules/queue/helper.go | 2 +- modules/queue/queue_bytefifo.go | 4 ++-- modules/queue/queue_disk_channel.go | 2 +- modules/queue/unique_queue_disk_channel.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/queue') diff --git a/modules/queue/helper.go b/modules/queue/helper.go index f1aba411a8..9ad95badeb 100644 --- a/modules/queue/helper.go +++ b/modules/queue/helper.go @@ -74,7 +74,7 @@ func unmarshalAs(bs []byte, exemplar interface{}) (data Data, err error) { } else { err = json.Unmarshal(bs, &data) } - return + return data, err } // assignableTo will check if provided data is assignable to the same type as the exemplar diff --git a/modules/queue/queue_bytefifo.go b/modules/queue/queue_bytefifo.go index 99c6428abc..79f69f07ce 100644 --- a/modules/queue/queue_bytefifo.go +++ b/modules/queue/queue_bytefifo.go @@ -73,7 +73,7 @@ func NewByteFIFOQueue(typ Type, byteFIFO ByteFIFO, handle HandlerFunc, cfg, exem failed = append(failed, fail) } } - return + return failed }, config.WorkerPoolConfiguration) return q, nil @@ -401,7 +401,7 @@ func NewByteFIFOUniqueQueue(typ Type, byteFIFO UniqueByteFIFO, handle HandlerFun failed = append(failed, fail) } } - return + return failed }, config.WorkerPoolConfiguration) return q, nil diff --git a/modules/queue/queue_disk_channel.go b/modules/queue/queue_disk_channel.go index 014d93f5b5..c00f620276 100644 --- a/modules/queue/queue_disk_channel.go +++ b/modules/queue/queue_disk_channel.go @@ -62,7 +62,7 @@ func NewPersistableChannelQueue(handle HandlerFunc, cfg, exemplar interface{}) ( failed = append(failed, fail) } } - return + return failed } channelQueue, err := NewChannelQueue(wrappedHandle, ChannelQueueConfiguration{ diff --git a/modules/queue/unique_queue_disk_channel.go b/modules/queue/unique_queue_disk_channel.go index 6ab03094ba..8e0322bb90 100644 --- a/modules/queue/unique_queue_disk_channel.go +++ b/modules/queue/unique_queue_disk_channel.go @@ -62,7 +62,7 @@ func NewPersistableChannelUniqueQueue(handle HandlerFunc, cfg, exemplar interfac failed = append(failed, fail) } } - return + return failed } channelUniqueQueue, err := NewChannelUniqueQueue(wrappedHandle, ChannelUniqueQueueConfiguration{ -- cgit v1.2.3