sander/rust-imap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorder variants alphabetically in try_from.

Browse source
This commit is contained in:
Todd Mortimer 2021-04-07 20:17:00 -04:00
parent f2d7919f60
commit 584c9542d8
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/types/unsolicited_response.rs
View file

@ -163,35 +163,6 @@ impl<'a> TryFrom<Response<'a>> for UnsolicitedResponse {
fn try_from(response: Response<'a>) -> Result<Self, Self::Error> { fn try_from(response: Response<'a>) -> Result<Self, Self::Error> {
match response { 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 { Response::Data {
status: Status::Bye, status: Status::Bye,
code, code,
@ -200,10 +171,39 @@ impl<'a> TryFrom<Response<'a>> for UnsolicitedResponse {
code: code.map(|c| c.into_owned()), code: code.map(|c| c.into_owned()),
information: information.map(|s| s.to_string()), 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 { Response::Fetch(id, attributes) => Ok(UnsolicitedResponse::Fetch {
id, id,
attributes: attributes.into_iter().map(|a| a.into_owned()).collect(), 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), _ => Err(response),
} }
} }