lint: simplify code (gosimple)

Replaces infinite for loops containing a select on a channel with a
single case with a range over the channel.

Removes redundant assignments to blank identifiers.

Remove unnecessary guard clause around delete().

Remove `if condition { return true } return false` with return condition

Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
Acked-by: Robin Jarry <robin@jarry.cc>

commands/mode/noquit.go

@@ -19,8 +19,5 @@ func NoQuitDone() {
 // QuitAllowed checks if aerc can exit normally (only when all goroutines that
 // requested a no-quit mode were done and called the NoQuitDone() function)
 func QuitAllowed() bool {
-	if atomic.LoadInt32(&noquit) > 0 {
+	return atomic.LoadInt32(&noquit) <= 0
-		return false
-	}
-	return true
 }

lib/msgstore.go

@@ -452,9 +452,7 @@ func (store *MessageStore) Delete(uids []uint32,
 
 func (store *MessageStore) revertDeleted(uids []uint32) {
 	for _, uid := range uids {
-		if _, ok := store.Deleted[uid]; ok {
+		delete(store.Deleted, uid)
-			delete(store.Deleted, uid)
-		}
 	}
 }
 

widgets/account-wizard.go

@@ -194,7 +194,7 @@ func NewAccountWizard(conf *config.AercConfig, aerc *Aerc) *AccountWizard {
 					}
 					wizard.imapUri()
 				}
-				hostport, srv = getSRV(server, []string{"submission"})
+				hostport, _ = getSRV(server, []string{"submission"})
 				if hostport != "" {
 					wizard.smtpServer.Set(hostport)
 					wizard.smtpMode = SMTP_STARTTLS

widgets/dirtree.go

@@ -385,7 +385,7 @@ func buildTree(node *types.Thread, stree [][]string, defaultUid uint32) {
 	}
 	sort.Strings(keys)
 	for _, key := range keys {
-		next, _ := m[key]
+		next := m[key]
 		var uid uint32 = defaultUid
 		for _, testStr := range next {
 			if len(testStr) == 1 {

worker/imap/idler.go

@@ -134,23 +134,20 @@ func (i *idler) waitOnIdle() {
 	i.log("wait for idle in background")
 	go func() {
 		defer logging.PanicHandler()
-		select {
+		err := <-i.done
-		case err := <-i.done:
+		if err == nil {
-			if err == nil {
+			i.log("<=(idle) waited")
-				i.log("<=(idle) waited")
+			i.log("connect done->")
-				i.log("connect done->")
+			i.worker.PostMessage(&types.Done{
-				i.worker.PostMessage(&types.Done{
+				Message: types.RespondTo(&types.Connect{}),
-					Message: types.RespondTo(&types.Connect{}),
+			}, nil)
-				}, nil)
+		} else {
-			} else {
+			i.log("<=(idle) waited; with err: %v", err)
-				i.log("<=(idle) waited; with err: %v", err)
-			}
-			i.setWaiting(false)
-			i.stop = make(chan struct{})
-			i.log("restart")
-			i.Start()
-			return
 		}
+		i.setWaiting(false)
+		i.stop = make(chan struct{})
+		i.log("restart")
+		i.Start()
 	}()
 }
 

worker/mbox/worker.go

@@ -363,20 +363,17 @@ func (w *mboxWorker) handleMessage(msg types.WorkerMessage) error {
 }
 
 func (w *mboxWorker) Run() {
-	for {
+	for msg := range w.worker.Actions {
-		select {
+		msg = w.worker.ProcessAction(msg)
-		case msg := <-w.worker.Actions:
+		if err := w.handleMessage(msg); err == errUnsupported {
-			msg = w.worker.ProcessAction(msg)
+			w.worker.PostMessage(&types.Unsupported{
-			if err := w.handleMessage(msg); err == errUnsupported {
+				Message: types.RespondTo(msg),
-				w.worker.PostMessage(&types.Unsupported{
+			}, nil)
-					Message: types.RespondTo(msg),
+		} else if err != nil {
-				}, nil)
+			w.worker.PostMessage(&types.Error{
-			} else if err != nil {
+				Message: types.RespondTo(msg),
-				w.worker.PostMessage(&types.Error{
+				Error:   err,
-					Message: types.RespondTo(msg),
+			}, nil)
-					Error:   err,
-				}, nil)
-			}
 		}
 	}
 }