Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-23 00:36:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace expect() in select_with_uidvalidity with an Error

Browse Source
This commit is contained in:
Alexander Krotov
2019-12-16 14:24:43 +03:00
parent 47d14271ab
commit e3031462c1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imap/mod.rs
View File

@@ -63,6 +63,9 @@ pub enum Error {
#[fail(display = "IMAP select folder error")] #[fail(display = "IMAP select folder error")]
SelectFolderError(#[cause] select_folder::Error), SelectFolderError(#[cause] select_folder::Error),
#[fail(display = "No mailbox selected, folder: {:?}", _0)]
NoMailbox(String),
#[fail(display = "IMAP other error: {:?}", _0)] #[fail(display = "IMAP other error: {:?}", _0)]
Other(String), Other(String),
} }
@@ -478,7 +481,10 @@ impl Imap {
let (uid_validity, last_seen_uid) = self.get_config_last_seen_uid(context, &folder); let (uid_validity, last_seen_uid) = self.get_config_last_seen_uid(context, &folder);
let config = self.config.read().await; let config = self.config.read().await;
let mailbox = config.selected_mailbox.as_ref().expect("just selected"); let mailbox = config
.selected_mailbox
.as_ref()
.ok_or_else(|| Error::NoMailbox(folder.to_string()))?;
let new_uid_validity = match mailbox.uid_validity { let new_uid_validity = match mailbox.uid_validity {
Some(v) => v, Some(v) => v,