Misc idiomatic fixes

2 files changed, 7 insertions, 10 deletions

diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index 7525da5..6ffdf3a 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -1,10 +1,10 @@
 package imap
 
 import (
-	"git.sr.ht/~sircmpwn/aerc2/worker/types"
-
 	"fmt"
 	"time"
+
+	"git.sr.ht/~sircmpwn/aerc2/worker/types"
 )
 
 type IMAPWorker struct {
@@ -32,15 +32,15 @@ func (w *IMAPWorker) PostAction(msg types.WorkerMessage) {
 	w.actions <- msg
 }
 
-func (w *IMAPWorker) handleMessage(_msg types.WorkerMessage) {
-	switch msg := _msg.(type) {
+func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) {
+	switch msg := msg.(type) {
 	case types.Ping:
 		w.messages <- types.Ack{
 			Message: types.RespondTo(msg),
 		}
 	default:
 		w.messages <- types.Unsupported{
-			Message: types.RespondTo(_msg),
+			Message: types.RespondTo(msg),
 		}
 	}
 }
diff --git a/worker/worker.go b/worker/worker.go
index a504790..da7928e 100644
--- a/worker/worker.go
+++ b/worker/worker.go
@@ -16,11 +16,8 @@ type Worker interface {
 
 // Guesses the appropriate worker type based on the given source string
 func NewWorker(source string) (Worker, error) {
-	var (
-		u   *url.URL
-		err error
-	)
-	if u, err = url.Parse(source); err != nil {
+	u, err := url.Parse(source)
+	if err != nil {
 		return nil, err
 	}
 	switch u.Scheme {