beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-22 02:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix wrong deps

Browse source
This commit is contained in:
Clément DOUIN 2024-04-14 16:03:04 +02:00
parent 58df66b5fa
commit cc79f5cc38
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
3 changed files with 26 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Cargo.lock generated
View file

@ -641,7 +641,6 @@ dependencies = [
"hashbrown", "hashbrown",
"regex-automata 0.3.9", "regex-automata 0.3.9",
"serde", "serde",
"stacker",
"unicode-ident", "unicode-ident",
] ]
@ -1218,8 +1217,9 @@ dependencies = [
[[package]] [[package]]
name = "email-lib" name = "email-lib"
version = "0.22.3" version = "0.24.0"
source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28526bad9d46fcfb2c6385961aeb4b684546c965d18a12e5552ca4af7cf1f35e"
dependencies = [ dependencies = [
"advisory-lock", "advisory-lock",
"async-trait", "async-trait",
@ -1268,7 +1268,8 @@ dependencies = [
[[package]] [[package]]
name = "email-macros" name = "email-macros"
version = "0.0.2" 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 = [ dependencies = [
"quote", "quote",
"syn 2.0.58", "syn 2.0.58",
@ -2256,8 +2257,9 @@ dependencies = [
[[package]] [[package]]
name = "keyring-lib" name = "keyring-lib"
version = "0.4.1" version = "0.4.2"
source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2e6d01e57f1b382ba5a1c40ef866855e8bab15f7caa4033480db80a5b9b9aff"
dependencies = [ dependencies = [
"keyring", "keyring",
"log", "log",
@ -2555,8 +2557,9 @@ dependencies = [
[[package]] [[package]]
name = "mml-lib" name = "mml-lib"
version = "1.0.10" version = "1.0.12"
source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3c6ac41c419e7857fdf7104a2f750c0d575969fa32f50a9d370ea3a3bcab1bf"
dependencies = [ dependencies = [
"async-recursion", "async-recursion",
"chumsky", "chumsky",
@ -2772,7 +2775,8 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]] [[package]]
name = "oauth-lib" name = "oauth-lib"
version = "0.1.1" 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 = [ dependencies = [
"log", "log",
"oauth2", "oauth2",
@ -3309,7 +3313,8 @@ dependencies = [
[[package]] [[package]]
name = "process-lib" name = "process-lib"
version = "0.4.2" 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 = [ dependencies = [
"log", "log",
"serde", "serde",
@ -3317,15 +3322,6 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "psm"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "quick-error" name = "quick-error"
version = "1.2.3" version = "1.2.3"
@ -3818,8 +3814,9 @@ dependencies = [
[[package]] [[package]]
name = "secret-lib" name = "secret-lib"
version = "0.4.3" version = "0.4.4"
source = "git+https://git.sr.ht/~soywod/pimalaya#ac7af0ccc2a42a64885654286048c74b9d9c800f" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d99d0df4b8cb27c13c953abaf74bd089922a783fad99cd2b08b369cf7fabcbc9"
dependencies = [ dependencies = [
"keyring-lib", "keyring-lib",
"log", "log",
@ -4022,7 +4019,8 @@ dependencies = [
[[package]] [[package]]
name = "shellexpand-utils" name = "shellexpand-utils"
version = "0.2.1" 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 = [ dependencies = [
"log", "log",
"shellexpand", "shellexpand",
@ -4127,19 +4125,6 @@ dependencies = [
"der", "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]] [[package]]
name = "static_assertions" name = "static_assertions"
version = "1.1.0" version = "1.1.0"

19
Cargo.toml
View file

@ -59,20 +59,20 @@ clap_mangen = "0.2"
console = "0.15.2" console = "0.15.2"
dialoguer = "0.10.2" dialoguer = "0.10.2"
dirs = "4" 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" email_address = "0.2.4"
env_logger = "0.8" env_logger = "0.8"
erased-serde = "0.3" erased-serde = "0.3"
indicatif = "0.17" indicatif = "0.17"
keyring-lib = { version = "=0.4.1", features = ["derive"] } keyring-lib = { version = "=0.4.2", features = ["derive"] }
log = "0.4" log = "0.4"
mail-builder = "0.3" mail-builder = "0.3"
md5 = "0.7" 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" oauth-lib = "=0.1.1"
once_cell = "1.16" once_cell = "1.16"
process-lib = { version = "=0.4.2", features = ["derive"] } 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 = { version = "1", features = ["derive"] }
serde-toml-merge = "0.3" serde-toml-merge = "0.3"
serde_json = "1" serde_json = "1"
@ -89,14 +89,3 @@ uuid = { version = "0.8", features = ["v4"] }
[target.'cfg(not(windows))'.dependencies.coredump] [target.'cfg(not(windows))'.dependencies.coredump]
version = "0.1" 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" }

4
src/account/command/sync.rs
View file

@ -120,7 +120,7 @@ impl AccountSyncCommand {
let included_folders = BTreeSet::from_iter(self.include_folder); let included_folders = BTreeSet::from_iter(self.include_folder);
let excluded_folders = BTreeSet::from_iter(self.exclude_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)) Some(FolderSyncStrategy::Include(included_folders))
} else if !excluded_folders.is_empty() { } else if !excluded_folders.is_empty() {
Some(FolderSyncStrategy::Exclude(excluded_folders)) Some(FolderSyncStrategy::Exclude(excluded_folders))
@ -131,7 +131,7 @@ impl AccountSyncCommand {
}; };
let sync_builder = 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 { if self.dry_run {
let report = sync_builder.with_dry_run(true).sync().await?; let report = sync_builder.with_dry_run(true).sync().await?;