fix: fix tests + macos build 3rd attempt

flake.lock

@@ -41,11 +41,11 @@
     "pimalaya": {
       "flake": false,
       "locked": {
-        "lastModified": 1780652576,
-        "narHash": "sha256-9ncrex9nl8b2NyHf0HcfqbtjX/aKsuyth0KrVWyJ/Mw=",
+        "lastModified": 1780851474,
+        "narHash": "sha256-OEQ6e6HbIfdjY+ROmg9BQ1EVdul/ExmlVro+wCEfadk=",
         "owner": "pimalaya",
         "repo": "nix",
-        "rev": "91a914ba77ba6799e5b959aa4bf39c5156f2f8c5",
+        "rev": "900731ab4e4778c14eb4faf7694e0aa9ef60a178",
         "type": "github"
       },
       "original": {

src/maildir/arg.rs

@@ -18,7 +18,7 @@
 use std::path::PathBuf;
 
 use clap::{Parser, ValueEnum};
-use io_maildir::maildir::MaildirSubdir;
+use io_maildir::maildir::types::MaildirSubdir;
 
 const INBOX: &str = "Inbox";
 

src/maildir/client.rs

@@ -28,7 +28,7 @@ use std::{
 };
 
 use anyhow::{Result, anyhow};
-use io_maildir::{client::MaildirClient as Inner, maildir::Maildir};
+use io_maildir::{client::MaildirClient as Inner, maildir::types::Maildir};
 use pimalaya_config::toml::TomlConfig;
 
 use crate::{account::context::Account, cli::load_or_wizard, config::MaildirConfig};

src/maildir/flag/add.rs

@@ -17,7 +17,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use io_maildir::flag::MaildirFlags;
+use io_maildir::flag::types::MaildirFlags;
 use pimalaya_cli::printer::{Message, Printer};
 
 use crate::maildir::{

src/maildir/flag/arg.rs

@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use clap::ValueEnum;
-use io_maildir::flag::MaildirFlag;
+use io_maildir::flag::types::MaildirFlag;
 
 #[derive(Clone, Debug, ValueEnum)]
 #[clap(rename_all = "kebab-case")]

src/maildir/flag/list.rs

@@ -20,7 +20,7 @@ use std::fmt;
 use anyhow::Result;
 use clap::Parser;
 use comfy_table::{Cell, ContentArrangement, Row, Table};
-use io_maildir::flag::MaildirFlag;
+use io_maildir::flag::types::MaildirFlag;
 use pimalaya_cli::printer::Printer;
 use serde::Serialize;
 

src/maildir/flag/remove.rs

@@ -17,7 +17,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use io_maildir::flag::MaildirFlags;
+use io_maildir::flag::types::MaildirFlags;
 use pimalaya_cli::printer::{Message, Printer};
 
 use crate::maildir::{

src/maildir/flag/set.rs

@@ -17,7 +17,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use io_maildir::flag::MaildirFlags;
+use io_maildir::flag::types::MaildirFlags;
 use pimalaya_cli::printer::{Message, Printer};
 
 use crate::maildir::{

src/maildir/list.rs

@@ -20,7 +20,7 @@ use std::{fmt, path::PathBuf};
 use anyhow::Result;
 use clap::Parser;
 use comfy_table::{Cell, Color, Row, Table};
-use io_maildir::maildir::Maildir;
+use io_maildir::maildir::types::Maildir;
 use pimalaya_cli::printer::Printer;
 use serde::Serialize;
 

src/maildir/message/save.rs

@@ -19,7 +19,7 @@ use std::{fmt, path::PathBuf};
 
 use anyhow::Result;
 use clap::Parser;
-use io_maildir::flag::MaildirFlags;
+use io_maildir::flag::types::MaildirFlags;
 use pimalaya_cli::printer::Printer;
 use serde::Serialize;
 

src/shared/flag/arg.rs

@@ -72,9 +72,9 @@ impl FlagArg {
 }
 
 #[cfg(feature = "maildir")]
-impl From<&FlagArg> for io_maildir::flag::MaildirFlag {
+impl From<&FlagArg> for io_maildir::flag::types::MaildirFlag {
     fn from(flag: &FlagArg) -> Self {
-        use io_maildir::flag::MaildirFlag;
+        use io_maildir::flag::types::MaildirFlag;
 
         match flag {
             FlagArg::Seen => MaildirFlag::Seen,