From f7a7937cb10a9b08593273f38caa73e0d5e6e560 Mon Sep 17 00:00:00 2001 From: Perma Alesheikh Date: Tue, 9 Jan 2024 12:35:32 +0330 Subject: [PATCH] use as_deref instead of as_ref for account.name Reasons: - More concise. - Avoids the need for map(String::str). Signed-off-by: Perma Alesheikh --- src/email/envelope/command/list.rs | 2 +- src/email/envelope/command/watch.rs | 2 +- src/email/envelope/flag/command/add.rs | 2 +- src/email/envelope/flag/command/remove.rs | 2 +- src/email/envelope/flag/command/set.rs | 2 +- src/email/message/attachment/command/download.rs | 2 +- src/email/message/command/copy.rs | 2 +- src/email/message/command/delete.rs | 2 +- src/email/message/command/forward.rs | 2 +- src/email/message/command/mailto.rs | 2 +- src/email/message/command/move_.rs | 2 +- src/email/message/command/read.rs | 2 +- src/email/message/command/reply.rs | 2 +- src/email/message/command/save.rs | 2 +- src/email/message/command/send.rs | 2 +- src/email/message/command/write.rs | 2 +- src/email/message/template/command/forward.rs | 2 +- src/email/message/template/command/reply.rs | 2 +- src/email/message/template/command/save.rs | 2 +- src/email/message/template/command/send.rs | 2 +- src/email/message/template/command/write.rs | 2 +- src/folder/command/create.rs | 2 +- src/folder/command/delete.rs | 2 +- src/folder/command/expunge.rs | 2 +- src/folder/command/list.rs | 2 +- src/folder/command/purge.rs | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/email/envelope/command/list.rs b/src/email/envelope/command/list.rs index 9b0c03a..9c941a1 100644 --- a/src/email/envelope/command/list.rs +++ b/src/email/envelope/command/list.rs @@ -71,7 +71,7 @@ impl ListEnvelopesCommand { info!("executing list envelopes command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/envelope/command/watch.rs b/src/email/envelope/command/watch.rs index 28a3c63..209347f 100644 --- a/src/email/envelope/command/watch.rs +++ b/src/email/envelope/command/watch.rs @@ -41,7 +41,7 @@ impl WatchEnvelopesCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/envelope/flag/command/add.rs b/src/email/envelope/flag/command/add.rs index d6bea2d..531d42b 100644 --- a/src/email/envelope/flag/command/add.rs +++ b/src/email/envelope/flag/command/add.rs @@ -46,7 +46,7 @@ impl FlagAddCommand { let folder = &self.folder.name; let (ids, flags) = into_tuple(&self.args.ids_and_flags); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/envelope/flag/command/remove.rs b/src/email/envelope/flag/command/remove.rs index 416c757..d6be3ba 100644 --- a/src/email/envelope/flag/command/remove.rs +++ b/src/email/envelope/flag/command/remove.rs @@ -46,7 +46,7 @@ impl FlagRemoveCommand { let folder = &self.folder.name; let (ids, flags) = into_tuple(&self.args.ids_and_flags); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/envelope/flag/command/set.rs b/src/email/envelope/flag/command/set.rs index e5a129e..84b2480 100644 --- a/src/email/envelope/flag/command/set.rs +++ b/src/email/envelope/flag/command/set.rs @@ -46,7 +46,7 @@ impl FlagSetCommand { let folder = &self.folder.name; let (ids, flags) = into_tuple(&self.args.ids_and_flags); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/attachment/command/download.rs b/src/email/message/attachment/command/download.rs index 448b633..1517c6b 100644 --- a/src/email/message/attachment/command/download.rs +++ b/src/email/message/attachment/command/download.rs @@ -47,7 +47,7 @@ impl AttachmentDownloadCommand { let ids = &self.envelopes.ids; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/copy.rs b/src/email/message/command/copy.rs index a00b330..0bb95cc 100644 --- a/src/email/message/command/copy.rs +++ b/src/email/message/command/copy.rs @@ -47,7 +47,7 @@ impl MessageCopyCommand { let ids = &self.envelopes.ids; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/delete.rs b/src/email/message/command/delete.rs index 841eadf..77a6ce5 100644 --- a/src/email/message/command/delete.rs +++ b/src/email/message/command/delete.rs @@ -48,7 +48,7 @@ impl MessageDeleteCommand { let ids = &self.envelopes.ids; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/forward.rs b/src/email/message/command/forward.rs index b079d9d..ba0e163 100644 --- a/src/email/message/command/forward.rs +++ b/src/email/message/command/forward.rs @@ -59,7 +59,7 @@ impl MessageForwardCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/mailto.rs b/src/email/message/command/mailto.rs index acc5d82..86a3cc0 100644 --- a/src/email/message/command/mailto.rs +++ b/src/email/message/command/mailto.rs @@ -56,7 +56,7 @@ impl MessageMailtoCommand { info!("executing mailto message command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/move_.rs b/src/email/message/command/move_.rs index fee1983..7ca7b1d 100644 --- a/src/email/message/command/move_.rs +++ b/src/email/message/command/move_.rs @@ -47,7 +47,7 @@ impl MessageMoveCommand { let ids = &self.envelopes.ids; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/read.rs b/src/email/message/command/read.rs index 6bd423e..a6de921 100644 --- a/src/email/message/command/read.rs +++ b/src/email/message/command/read.rs @@ -92,7 +92,7 @@ impl MessageReadCommand { let ids = &self.envelopes.ids; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/reply.rs b/src/email/message/command/reply.rs index ec4dfba..2eee59a 100644 --- a/src/email/message/command/reply.rs +++ b/src/email/message/command/reply.rs @@ -61,7 +61,7 @@ impl MessageReplyCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/save.rs b/src/email/message/command/save.rs index b36f90d..d7e62f4 100644 --- a/src/email/message/command/save.rs +++ b/src/email/message/command/save.rs @@ -45,7 +45,7 @@ impl MessageSaveCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/send.rs b/src/email/message/command/send.rs index 650cfe1..cc212e9 100644 --- a/src/email/message/command/send.rs +++ b/src/email/message/command/send.rs @@ -44,7 +44,7 @@ impl MessageSendCommand { info!("executing send message command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/command/write.rs b/src/email/message/command/write.rs index a302a4d..18e4854 100644 --- a/src/email/message/command/write.rs +++ b/src/email/message/command/write.rs @@ -50,7 +50,7 @@ impl MessageWriteCommand { info!("executing write message command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/template/command/forward.rs b/src/email/message/template/command/forward.rs index aea5c17..db23211 100644 --- a/src/email/message/template/command/forward.rs +++ b/src/email/message/template/command/forward.rs @@ -53,7 +53,7 @@ impl TemplateForwardCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/template/command/reply.rs b/src/email/message/template/command/reply.rs index b73d068..583cae1 100644 --- a/src/email/message/template/command/reply.rs +++ b/src/email/message/template/command/reply.rs @@ -58,7 +58,7 @@ impl TemplateReplyCommand { let id = self.envelope.id; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/template/command/save.rs b/src/email/message/template/command/save.rs index dea5668..491edb4 100644 --- a/src/email/message/template/command/save.rs +++ b/src/email/message/template/command/save.rs @@ -49,7 +49,7 @@ impl TemplateSaveCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/template/command/send.rs b/src/email/message/template/command/send.rs index 4b57ce4..4654f2b 100644 --- a/src/email/message/template/command/send.rs +++ b/src/email/message/template/command/send.rs @@ -47,7 +47,7 @@ impl TemplateSendCommand { info!("executing send template command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/email/message/template/command/write.rs b/src/email/message/template/command/write.rs index bd91c2a..687f475 100644 --- a/src/email/message/template/command/write.rs +++ b/src/email/message/template/command/write.rs @@ -36,7 +36,7 @@ impl TemplateWriteCommand { info!("executing write template command"); let (_, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/folder/command/create.rs b/src/folder/command/create.rs index c0a5986..aef5dbe 100644 --- a/src/folder/command/create.rs +++ b/src/folder/command/create.rs @@ -38,7 +38,7 @@ impl AddFolderCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/folder/command/delete.rs b/src/folder/command/delete.rs index 7fe3ff2..112747e 100644 --- a/src/folder/command/delete.rs +++ b/src/folder/command/delete.rs @@ -51,7 +51,7 @@ impl FolderDeleteCommand { }; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/folder/command/expunge.rs b/src/folder/command/expunge.rs index ac13562..e7ad35c 100644 --- a/src/folder/command/expunge.rs +++ b/src/folder/command/expunge.rs @@ -39,7 +39,7 @@ impl FolderExpungeCommand { let folder = &self.folder.name; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/folder/command/list.rs b/src/folder/command/list.rs index bbef9cd..b535d45 100644 --- a/src/folder/command/list.rs +++ b/src/folder/command/list.rs @@ -40,7 +40,7 @@ impl FolderListCommand { info!("executing list folders command"); let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?; diff --git a/src/folder/command/purge.rs b/src/folder/command/purge.rs index 800c373..baf16e6 100644 --- a/src/folder/command/purge.rs +++ b/src/folder/command/purge.rs @@ -49,7 +49,7 @@ impl FolderPurgeCommand { }; let (toml_account_config, account_config) = config.clone().into_account_configs( - self.account.name.as_ref().map(String::as_str), + self.account.name.as_deref(), #[cfg(feature = "account-sync")] self.cache.disable, )?;