From cc79f5cc388ca94cea5235ac233aef9fe3024909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Sun, 14 Apr 2024 16:03:04 +0200 Subject: [PATCH] fix wrong deps --- Cargo.lock | 55 ++++++++++++++----------------------- Cargo.toml | 19 +++---------- src/account/command/sync.rs | 4 +-- 3 files changed, 26 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d52e29..9cc8cbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,7 +641,6 @@ dependencies = [ "hashbrown", "regex-automata 0.3.9", "serde", - "stacker", "unicode-ident", ] @@ -1218,8 +1217,9 @@ dependencies = [ [[package]] name = "email-lib" -version = "0.22.3" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28526bad9d46fcfb2c6385961aeb4b684546c965d18a12e5552ca4af7cf1f35e" dependencies = [ "advisory-lock", "async-trait", @@ -1268,7 +1268,8 @@ dependencies = [ [[package]] name = "email-macros" version = "0.0.2" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f24a09fd651027f8764f8a12c12358715cb9bab622ab3125ede3dd6ae047c95" dependencies = [ "quote", "syn 2.0.58", @@ -2256,8 +2257,9 @@ dependencies = [ [[package]] name = "keyring-lib" -version = "0.4.1" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e6d01e57f1b382ba5a1c40ef866855e8bab15f7caa4033480db80a5b9b9aff" dependencies = [ "keyring", "log", @@ -2555,8 +2557,9 @@ dependencies = [ [[package]] name = "mml-lib" -version = "1.0.10" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c6ac41c419e7857fdf7104a2f750c0d575969fa32f50a9d370ea3a3bcab1bf" dependencies = [ "async-recursion", "chumsky", @@ -2772,7 +2775,8 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "oauth-lib" version = "0.1.1" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd81f50b3bdf9656f511a776e5a76c249e00d7ce5c0c9071d0b923177d9248d" dependencies = [ "log", "oauth2", @@ -3309,7 +3313,8 @@ dependencies = [ [[package]] name = "process-lib" version = "0.4.2" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0600893efc62c84ded38fec2b022ada4d4d80e48a8df5bceb070c865bf8a33a9" dependencies = [ "log", "serde", @@ -3317,15 +3322,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -3818,8 +3814,9 @@ dependencies = [ [[package]] name = "secret-lib" -version = "0.4.3" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99d0df4b8cb27c13c953abaf74bd089922a783fad99cd2b08b369cf7fabcbc9" dependencies = [ "keyring-lib", "log", @@ -4022,7 +4019,8 @@ dependencies = [ [[package]] name = "shellexpand-utils" version = "0.2.1" -source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c15a8f3693529b38d1be40ec6016bb6317ebee4a0208a813a75e3538f3e439f5" dependencies = [ "log", "shellexpand", @@ -4127,19 +4125,6 @@ dependencies = [ "der", ] -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - [[package]] name = "static_assertions" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index eea1431..14cecb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,20 +59,20 @@ clap_mangen = "0.2" console = "0.15.2" dialoguer = "0.10.2" dirs = "4" -email-lib = { version = "=0.22.3", default-features = false, features = ["derive"] } +email-lib = { version = "=0.24.0", default-features = false, features = ["derive"] } email_address = "0.2.4" env_logger = "0.8" erased-serde = "0.3" indicatif = "0.17" -keyring-lib = { version = "=0.4.1", features = ["derive"] } +keyring-lib = { version = "=0.4.2", features = ["derive"] } log = "0.4" mail-builder = "0.3" md5 = "0.7" -mml-lib = { version = "=1.0.10", default-features = false, features = ["derive"] } +mml-lib = { version = "=1.0.12", default-features = false, features = ["derive"] } oauth-lib = "=0.1.1" once_cell = "1.16" process-lib = { version = "=0.4.2", features = ["derive"] } -secret-lib = { version = "=0.4.3", features = ["derive"] } +secret-lib = { version = "=0.4.4", features = ["derive"] } serde = { version = "1", features = ["derive"] } serde-toml-merge = "0.3" serde_json = "1" @@ -89,14 +89,3 @@ uuid = { version = "0.8", features = ["v4"] } [target.'cfg(not(windows))'.dependencies.coredump] version = "0.1" - -[patch.crates-io] -email-lib = { path = "/home/soywod/sourcehut/pimalaya/email" } -# email-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -email-macros = { git = "https://git.sr.ht/~soywod/pimalaya" } -keyring-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -mml-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -oauth-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -process-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -secret-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -shellexpand-utils = { git = "https://git.sr.ht/~soywod/pimalaya" } diff --git a/src/account/command/sync.rs b/src/account/command/sync.rs index 541dc27..18ae59c 100644 --- a/src/account/command/sync.rs +++ b/src/account/command/sync.rs @@ -120,7 +120,7 @@ impl AccountSyncCommand { let included_folders = BTreeSet::from_iter(self.include_folder); let excluded_folders = BTreeSet::from_iter(self.exclude_folder); - let folders_filter = if !included_folders.is_empty() { + let folder_filters = if !included_folders.is_empty() { Some(FolderSyncStrategy::Include(included_folders)) } else if !excluded_folders.is_empty() { Some(FolderSyncStrategy::Exclude(excluded_folders)) @@ -131,7 +131,7 @@ impl AccountSyncCommand { }; let sync_builder = - AccountSyncBuilder::try_new(right)?.with_some_folders_filter(folders_filter); + AccountSyncBuilder::try_new(right)?.with_some_folder_filters(folder_filters); if self.dry_run { let report = sync_builder.with_dry_run(true).sync().await?;