4 files changed, 8 insertions(+), 9 deletions(-)

M commands/msg/delete.go
M commands/msg/forward.go
M commands/msg/unsubscribe_test.go
M lib/msgstore.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 {

@@ 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)
 			})
 		})

@@ 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",
 		}},
 	}

@@ 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()