beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-07-05 17:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

use if let instead of a map with only sideeffects

Browse source 
Reasons:
- Map is usually intended for transforming a value, and as is not
  idiomatically used for only doing side-effects and control flow.

Signed-off-by: Perma Alesheikh <me@prma.dev>
This commit is contained in:
Perma Alesheikh 2024-01-09 14:04:18 +03:30 committed by Clément DOUIN
parent 0f097fe293
commit b417ad11a0
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/config/wizard.rs
View file

@ -102,35 +102,35 @@ pub(crate) async fn configure(path: PathBuf) -> Result<TomlConfig> {
set_table_dotted(item, "sync-folders-strategy"); set_table_dotted(item, "sync-folders-strategy");
set_table_dotted(item, "folder"); set_table_dotted(item, "folder");
get_table_mut(item, "folder").map(|item| { if let Some(item) = get_table_mut(item, "folder") {
set_tables_dotted(item, ["add", "list", "expunge", "purge", "delete"]); set_tables_dotted(item, ["add", "list", "expunge", "purge", "delete"]);
}); }
set_table_dotted(item, "envelope"); set_table_dotted(item, "envelope");
get_table_mut(item, "envelope").map(|item| { if let Some(item) = get_table_mut(item, "envelope") {
set_tables_dotted(item, ["list", "get"]); set_tables_dotted(item, ["list", "get"]);
}); }
set_table_dotted(item, "flag"); set_table_dotted(item, "flag");
get_table_mut(item, "flag").map(|item| { if let Some(item) = get_table_mut(item, "flag") {
set_tables_dotted(item, ["add", "set", "remove"]); set_tables_dotted(item, ["add", "set", "remove"]);
}); }
set_table_dotted(item, "message"); set_table_dotted(item, "message");
get_table_mut(item, "message").map(|item| { if let Some(item) = get_table_mut(item, "message") {
set_tables_dotted( set_tables_dotted(
item, item,
["add", "send", "peek", "get", "copy", "move", "delete"], ["add", "send", "peek", "get", "copy", "move", "delete"],
); );
}); }
set_table_dotted(item, "maildir"); set_table_dotted(item, "maildir");
#[cfg(feature = "imap")] #[cfg(feature = "imap")]
{ {
set_table_dotted(item, "imap"); set_table_dotted(item, "imap");
get_table_mut(item, "imap").map(|item| { if let Some(item) = get_table_mut(item, "imap") {
set_tables_dotted(item, ["passwd", "oauth2"]); set_tables_dotted(item, ["passwd", "oauth2"]);
}); }
} }
#[cfg(feature = "notmuch")] #[cfg(feature = "notmuch")]
set_table_dotted(item, "notmuch"); set_table_dotted(item, "notmuch");
@ -138,9 +138,9 @@ pub(crate) async fn configure(path: PathBuf) -> Result<TomlConfig> {
#[cfg(feature = "smtp")] #[cfg(feature = "smtp")]
{ {
set_table_dotted(item, "smtp"); set_table_dotted(item, "smtp");
get_table_mut(item, "smtp").map(|item| { if let Some(item) = get_table_mut(item, "smtp") {
set_tables_dotted(item, ["passwd", "oauth2"]); set_tables_dotted(item, ["passwd", "oauth2"]);
}); }
} }
#[cfg(feature = "pgp")] #[cfg(feature = "pgp")]
@ -158,9 +158,9 @@ fn get_table_mut<'a>(item: &'a mut Item, key: &'a str) -> Option<&'a mut Item> {
} }
fn set_table_dotted(item: &mut Item, key: &str) { fn set_table_dotted(item: &mut Item, key: &str) {
get_table_mut(item, key) if let Some(table) = get_table_mut(item, key).and_then(|item| item.as_table_mut()) {
.and_then(|item| item.as_table_mut()) table.set_dotted(true)
.map(|table| table.set_dotted(true)); }
} }
fn set_tables_dotted<'a>(item: &'a mut Item, keys: impl IntoIterator<Item = &'a str>) { fn set_tables_dotted<'a>(item: &'a mut Item, keys: impl IntoIterator<Item = &'a str>) {