From 584c9542d8a94ce65343999b7b7d882dd9896d6d Mon Sep 17 00:00:00 2001
From: Todd Mortimer <todd@opennet.ca>
Date: Wed, 7 Apr 2021 20:17:00 -0400
Subject: [PATCH] Reorder variants alphabetically in try_from.

---
 src/types/unsolicited_response.rs | 58 +++++++++++++++----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/types/unsolicited_response.rs b/src/types/unsolicited_response.rs
index 1bf75d6..67a8c36 100644
--- a/src/types/unsolicited_response.rs
+++ b/src/types/unsolicited_response.rs
@@ -163,35 +163,6 @@ impl<'a> TryFrom<Response<'a>> for UnsolicitedResponse {
 
     fn try_from(response: Response<'a>) -> Result<Self, Self::Error> {
         match response {
-            Response::MailboxData(MailboxDatum::Status { mailbox, status }) => {
-                Ok(UnsolicitedResponse::Status {
-                    mailbox: mailbox.into(),
-                    attributes: status,
-                })
-            }
-            Response::MailboxData(MailboxDatum::Recent(n)) => Ok(UnsolicitedResponse::Recent(n)),
-            Response::MailboxData(MailboxDatum::Flags(flags)) => {
-                Ok(UnsolicitedResponse::Flags(Flag::from_strs(flags).collect()))
-            }
-            Response::MailboxData(MailboxDatum::Exists(n)) => Ok(UnsolicitedResponse::Exists(n)),
-            Response::MailboxData(MailboxDatum::MetadataUnsolicited { mailbox, values }) => {
-                Ok(UnsolicitedResponse::Metadata {
-                    mailbox: mailbox.to_string(),
-                    metadata_entries: values.iter().map(|s| s.to_string()).collect(),
-                })
-            }
-            Response::Expunge(n) => Ok(UnsolicitedResponse::Expunge(n)),
-            Response::Vanished { earlier, uids } => {
-                Ok(UnsolicitedResponse::Vanished { earlier, uids })
-            }
-            Response::Data {
-                status: Status::Ok,
-                code,
-                information,
-            } => Ok(UnsolicitedResponse::Ok {
-                code: code.map(|c| c.into_owned()),
-                information: information.map(|s| s.to_string()),
-            }),
             Response::Data {
                 status: Status::Bye,
                 code,
@@ -200,10 +171,39 @@ impl<'a> TryFrom<Response<'a>> for UnsolicitedResponse {
                 code: code.map(|c| c.into_owned()),
                 information: information.map(|s| s.to_string()),
             }),
+            Response::Data {
+                status: Status::Ok,
+                code,
+                information,
+            } => Ok(UnsolicitedResponse::Ok {
+                code: code.map(|c| c.into_owned()),
+                information: information.map(|s| s.to_string()),
+            }),
+            Response::Expunge(n) => Ok(UnsolicitedResponse::Expunge(n)),
             Response::Fetch(id, attributes) => Ok(UnsolicitedResponse::Fetch {
                 id,
                 attributes: attributes.into_iter().map(|a| a.into_owned()).collect(),
             }),
+            Response::MailboxData(MailboxDatum::Exists(n)) => Ok(UnsolicitedResponse::Exists(n)),
+            Response::MailboxData(MailboxDatum::Flags(flags)) => {
+                Ok(UnsolicitedResponse::Flags(Flag::from_strs(flags).collect()))
+            }
+            Response::MailboxData(MailboxDatum::MetadataUnsolicited { mailbox, values }) => {
+                Ok(UnsolicitedResponse::Metadata {
+                    mailbox: mailbox.to_string(),
+                    metadata_entries: values.iter().map(|s| s.to_string()).collect(),
+                })
+            }
+            Response::MailboxData(MailboxDatum::Recent(n)) => Ok(UnsolicitedResponse::Recent(n)),
+            Response::MailboxData(MailboxDatum::Status { mailbox, status }) => {
+                Ok(UnsolicitedResponse::Status {
+                    mailbox: mailbox.into(),
+                    attributes: status,
+                })
+            }
+            Response::Vanished { earlier, uids } => {
+                Ok(UnsolicitedResponse::Vanished { earlier, uids })
+            }
             _ => Err(response),
         }
     }