From d5a494a01d94411dee96f5fe2372c30dffd5ed5a Mon Sep 17 00:00:00 2001
From: TornaxO7 <50843046+TornaxO7@users.noreply.github.com>
Date: Wed, 23 Feb 2022 23:24:17 +0100
Subject: [PATCH] fix maildir expansion (#307)

* Applied shellexpand to maildir_dir

* change to account_config: applied shellexpand to maildir_dir

* rustfmt: removing required version, formatted project

* changing type of `maildir_dir` to `String` and adding shellexpand to
`maildir_dir`
---
 rustfmt.toml                              | 1 -
 src/config/account_config.rs              | 2 +-
 src/config/deserialized_account_config.rs | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index c39d2eb..a04de65 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -61,7 +61,6 @@ use_field_init_shorthand = false
 force_explicit_abi = true
 condense_wildcard_suffixes = false
 color = "Auto"
-required_version = "1.4.37"
 unstable_features = false
 disable_all_formatting = false
 skip_children = false
diff --git a/src/config/account_config.rs b/src/config/account_config.rs
index 44c02c0..03bcc6a 100644
--- a/src/config/account_config.rs
+++ b/src/config/account_config.rs
@@ -191,7 +191,7 @@ impl<'a> AccountConfig {
             }),
             DeserializedAccountConfig::Maildir(config) => {
                 BackendConfig::Maildir(MaildirBackendConfig {
-                    maildir_dir: config.maildir_dir.clone(),
+                    maildir_dir: shellexpand::full(&config.maildir_dir)?.to_string().into(),
                 })
             }
         };
diff --git a/src/config/deserialized_account_config.rs b/src/config/deserialized_account_config.rs
index 595e50b..becfa81 100644
--- a/src/config/deserialized_account_config.rs
+++ b/src/config/deserialized_account_config.rs
@@ -121,4 +121,4 @@ make_account_config!(
     imap_passwd_cmd: String
 );
 
-make_account_config!(DeserializedMaildirAccountConfig, maildir_dir: PathBuf);
+make_account_config!(DeserializedMaildirAccountConfig, maildir_dir: String);