Update vendor/

vendor/github.com/emersion/go-imap/responses/status.go

@@ -7,57 +7,47 @@ import (
 	"github.com/emersion/go-imap/utf7"
 )
 
+const statusName = "STATUS"
+
 // A STATUS response.
 // See RFC 3501 section 7.2.4
 type Status struct {
 	Mailbox *imap.MailboxStatus
 }
 
-func (r *Status) HandleFrom(hdlr imap.RespHandler) error {
+func (r *Status) Handle(resp imap.Resp) error {
 	if r.Mailbox == nil {
 		r.Mailbox = &imap.MailboxStatus{}
 	}
 	mbox := r.Mailbox
-	mbox.Items = nil
 
-	for h := range hdlr {
-		fields, ok := h.AcceptNamedResp(imap.Status)
-		if !ok {
-			continue
-		}
-		if len(fields) < 2 {
-			return errors.New("STATUS response expects two fields")
-		}
-
-		name, ok := fields[0].(string)
-		if !ok {
-			return errors.New("STATUS response expects a string as first argument")
-		}
-		mbox.Name, _ = utf7.Decoder.String(name)
-		mbox.Name = imap.CanonicalMailboxName(mbox.Name)
-
-		var items []interface{}
-		if items, ok = fields[1].([]interface{}); !ok {
-			return errors.New("STATUS response expects a list as second argument")
-		}
-
-		if err := mbox.Parse(items); err != nil {
-			return err
-		}
+	name, fields, ok := imap.ParseNamedResp(resp)
+	if !ok || name != statusName {
+		return ErrUnhandled
+	} else if len(fields) < 2 {
+		return errNotEnoughFields
 	}
 
-	return nil
+	if name, err := imap.ParseString(fields[0]); err != nil {
+		return err
+	} else if name, err := utf7.Encoding.NewDecoder().String(name); err != nil {
+		return err
+	} else {
+		mbox.Name = imap.CanonicalMailboxName(name)
+	}
+
+	var items []interface{}
+	if items, ok = fields[1].([]interface{}); !ok {
+		return errors.New("STATUS response expects a list as second argument")
+	}
+
+	mbox.Items = nil
+	return mbox.Parse(items)
 }
 
 func (r *Status) WriteTo(w *imap.Writer) error {
 	mbox := r.Mailbox
-
-	fields := []interface{}{imap.Status, mbox.Name, mbox.Format()}
-
-	res := imap.NewUntaggedResp(fields)
-	if err := res.WriteTo(w); err != nil {
-		return err
-	}
-
-	return nil
+	name, _ := utf7.Encoding.NewEncoder().String(mbox.Name)
+	fields := []interface{}{statusName, name, mbox.Format()}
+	return imap.NewUntaggedResp(fields).WriteTo(w)
 }