diff options
| -rw-r--r-- | commands/msg/delete.go | 1 | ||||
| -rw-r--r-- | commands/msg/forward.go | 2 | ||||
| -rw-r--r-- | commands/msg/unsubscribe_test.go | 12 | ||||
| -rw-r--r-- | lib/msgstore.go | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/commands/msg/delete.go b/commands/msg/delete.go index baa5011f..677a666d 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -97,7 +97,6 @@ func findNextNonDeleted(deleted []uint32, store *lib.MessageStore) *models.Messa } return next } - return nil // Never reached } func contains(uids []uint32, uid uint32) bool { diff --git a/commands/msg/forward.go b/commands/msg/forward.go index 475d6805..edade6d1 100644 --- a/commands/msg/forward.go +++ b/commands/msg/forward.go @@ -132,7 +132,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error { return } composer.AddAttachment(tmpFileName) - composer.OnClose(func(composer *widgets.Composer) { + composer.OnClose(func(_ *widgets.Composer) { os.RemoveAll(tmpDir) }) }) diff --git a/commands/msg/unsubscribe_test.go b/commands/msg/unsubscribe_test.go index e4e6f25e..d34efb1a 100644 --- a/commands/msg/unsubscribe_test.go +++ b/commands/msg/unsubscribe_test.go @@ -10,19 +10,19 @@ func TestParseUnsubscribe(t *testing.T) { expected []string } cases := []*tc{ - &tc{"", []string{}}, - &tc{"invalid", []string{}}, - &tc{"<https://example.com>, <http://example.com>", []string{ + {"", []string{}}, + {"invalid", []string{}}, + {"<https://example.com>, <http://example.com>", []string{ "https://example.com", "http://example.com", }}, - &tc{"<https://example.com> is a URL", []string{ + {"<https://example.com> is a URL", []string{ "https://example.com", }}, - &tc{"<mailto:user@host?subject=unsubscribe>, <https://example.com>", + {"<mailto:user@host?subject=unsubscribe>, <https://example.com>", []string{ "mailto:user@host?subject=unsubscribe", "https://example.com", }}, - &tc{"<>, <https://example> ", []string{ + {"<>, <https://example> ", []string{ "", "https://example", }}, } diff --git a/lib/msgstore.go b/lib/msgstore.go index b95b68f3..7af9fd22 100644 --- a/lib/msgstore.go +++ b/lib/msgstore.go @@ -594,7 +594,7 @@ func (store *MessageStore) Sort(criteria []*types.SortCriterion, cb func()) { store.Sorting = true store.worker.PostAction(&types.FetchDirectoryContents{ SortCriteria: criteria, - }, func(msg types.WorkerMessage) { + }, func(_ types.WorkerMessage) { store.Sorting = false if cb != nil { cb() |